diff --git a/templates/chat/skillroll.html b/templates/chat/skillroll.html
deleted file mode 100644
index f45ae16..0000000
--- a/templates/chat/skillroll.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<div class="mosh" {{#if actor._id}}data-actor-id="{{actor._id}}" {{/if}}
-    {{#if item._id}}data-item-id="{{item._id}}"{{/if}} {{#if tokenId}}data-token-id="{{tokenId}}" {{/if}}>
-    <div class="showinfo"></div>
-    <div class="showlessinfo"></div>
-
-    <div class="rollcontainer">
-        <div class="rollh1">{{item.name}}</div>
-
-        {{#if advantage}}
-        <div class="rollh2">A/D</div>
-        {{else}}
-        <div class="rollh2">{{data.resultText.value}}</div>
-        {{/if}}
-
-        <div class="roll-grid">
-            {{#if advantage}}
-            <div class="roll-result">{{data.diceTotal.value}} / {{data.diceTotal.advantageValue}}</div>
-            {{else}}
-            <div class="roll-result">{{data.diceTotal.value}}</div>
-            {{/if}}
-
-            {{#if data.isCreature.value}}
-            <div class="gmonly">
-                <span class="tooltiptext">
-                    {{#each diceData.dice}}
-                    <div class="{{#if this.dice}}dice{{else}}modifier{{/if}}">
-                        <label style="color:{{this.color}};">
-                            {{this.result}}
-                        </label>
-                        {{#if this.img}}
-                        <img src='{{this.img}}' />
-                        {{/if}}
-                    </div>
-                    {{/each}}
-                </span>
-            </div>
-            {{else}}
-            <span class="tooltiptext">
-                {{#each diceData.dice}}
-                <div class="{{#if this.dice}}dice{{else}}modifier{{/if}}">
-                    <label style="color:{{this.color}};">
-                        {{this.result}}
-                    </label>
-                    {{#if this.img}}
-                    <img src='{{this.img}}' />
-                    {{/if}}
-                </div>
-                {{/each}}
-            </span>
-            {{/if}}
-        </div>
-        <div class="roll-target">
-            <div class="valuetext">Target:</div>
-            <div class="roll-targetbox">
-                {{#if useSkill}}
-                <div class="value">{{this.target}} + {{this.mod}}</div>
-                {{else}}
-                <div class="value">{{this.target}} + {{this.mod}} + {{skillbonus}}</div>
-                {{/if}}
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/templates/chat/statroll.html b/templates/chat/statroll.html
deleted file mode 100644
index d62cf6b..0000000
--- a/templates/chat/statroll.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<div class="mosh" {{#if actor._id}}data-actor-id="{{actor._id}}" {{/if}}
-    {{#if item._id}}data-item-id="{{item._id}}" {{/if}} {{#if tokenId}}data-token-id="{{tokenId}}" {{/if}}>
-    <div class="showinfo"></div>
-    <div class="showlessinfo"></div>
-
-    <div class="rollcontainer">
-        {{#if onlyDesc}}
-        <div class="flexrow">
-            <div class="rollweaponh1">{{item.name}}
-            </div>
-            <div style="text-align: right"><img class="roll-image" src="{{item.img}}" title="{{item.name}}" /></div>
-        </div>
-        {{{insert}}}
-        <div class="description" style="margin-bottom : 10px;">
-            <div class="body">{{{item.system.description}}}</div>
-        </div>
-        {{else}}
-        {{#if isWeapon}}
-        <div class="flexrow">
-            <div class="rollweaponh1">{{item.name}}
-            </div>
-            <div style="text-align: right"><img class="roll-image" src="{{item.img}}" title="{{item.name}}" /></div>
-        </div>
-        {{else}}
-        <div class="rollh1">{{stat.name}}</div>
-        {{/if}}
-
-        {{#if advantage}}
-        <div class="rollh2">A/D</div>
-        {{else}}
-        <div class="rollh2">{{data.resultText.value}}</div>
-        {{/if}}
-
-        <div class="roll-grid">
-            {{#if advantage}}
-            <div class="roll-result">{{data.diceTotal.value}} / {{data.diceTotal.advantageValue}}</div>
-            {{else}}
-            <div class="roll-result">{{data.diceTotal.value}}</div>
-            {{/if}}
-        </div>
-        <div class="roll-target">
-            <div class="valuetext">Target:</div>
-            <div class="roll-targetbox">
-                <div class="value">{{targetValue}}</div>
-            </div>
-        </div>
-        <div class="rollmods">
-            <div class="valuetext">{{stat.name}} ({{this.target}})</div>
-            <div class="valuetext">Mod ({{this.mod}})</div>
-            {{#if useSkill}}
-            <div class="valuetext">{{item.name}} ({{item.system.bonus}})</div>
-            {{/if}}
-            {{#if isWeapon}}
-            <div class="valuetext">{{item.name}} ({{bonus}})</div>
-            {{/if}}
-        </div>
-        <!-- Damage Roll -->
-        {{#if isWeapon}}
-        <div class="roll-damage">Damage</div>
-        <div>
-            <div class="roll-damagebox">
-                <div class="value">{{data.diceTotal.damageValue}}</div>
-            </div>
-        </div>
-        <div class="rollmods" style="margin-top: 0px;">({{item.system.damage}})</div>
-        <br/>
-        
-        <div class="rollmods">Range: {{range}}</div>
-
-        {{#if item.system.shots}}
-        <div class="rollmods">Shots: {{item.system.curShots}}/{{item.system.shots}}</div>
-        {{else}}
-            {{#if item.system.useAmmo}}
-            <div class="rollmods">Ammo: {{item.system.ammo}}</div>
-            {{/if}}
-        {{/if}}
-        
-        {{#if critical}}
-        <div class="description">
-            <div class="header padding" style = "grid: none;">Critical</div>
-            <br/>
-            <div class="body">Crit Damage: [[/r {{item.system.critDmg}}]]</div>
-            <div class="body">Crit Effect: {{item.system.critEffect}}</div>
-        </div>
-        <br/>
-        {{/if}}
-
-        {{#if item.system.description}}
-        <div class="description">
-            <div class="header padding" style = "grid: none;">Description</div>
-            <div class="body">{{{item.system.description}}}</div>
-        </div>
-        {{/if}}
-        {{/if}}
-        {{/if}}
-        {{#if useSkill}}
-        <div class="description">
-            <div class="header padding" style = "grid: none;">Description</div>
-            <div class="body">{{{item.system.description}}}</div>
-        </div>
-        {{/if}}
-        {{#if data.panic}}
-        <div class="description">
-            <div class="header padding" style="color: red; grid: none;">Panic</div>
-            <div class="body">{{{data.panicText}}}</div>
-            <br/>
-        </div>
-        {{/if}}
-    </div>
\ No newline at end of file