diff --git a/templates/BootstrapCheckboxField_holder.ss b/templates/BootstrapCheckboxField_holder.ss
deleted file mode 100644
index 69e9ead..0000000
--- a/templates/BootstrapCheckboxField_holder.ss
+++ /dev/null
@@ -1,19 +0,0 @@
-<div id="$Name" class="field $extraClass $HolderClasses" $HolderAttributes <% if DisplayLogic %>data-display-logic-masters="$DisplayLogicMasters"<% end_if %>>
-    <div class="controls">
-        <label class="checkbox" for="$ID">
-            <input $AttributesHTML>
-            $Title
-        </label>
-
-        <% if HelpText %>
-        <p class="help-block">$HelpText</p>
-        <% end_if %>
-        <% if InlineHelpText %>
-        <span class="help-inline">$InlineHelpText</span>
-        <% end_if %>
-    </div>
-    <% if DisplayLogic %>
-    <div class="display-logic-eval">$DisplayLogic</div>
-    <% end_if %>
-</div>
-
diff --git a/templates/BootstrapCheckboxSetField.ss b/templates/BootstrapCheckboxSetField.ss
deleted file mode 100644
index d156831..0000000
--- a/templates/BootstrapCheckboxSetField.ss
+++ /dev/null
@@ -1,30 +0,0 @@
-<div $AttributesHTML>
-    <% if $Options.Count %>
-        <% if $HasColumns %>
-            <div class="row">
-                <div class="$ColumnClasses">
-                <% loop $Options %>                    
-                    <div class="checkbox <% if $Up.Inline %>inline<% end_if %>">
-                        <label>
-                            <input id="$ID" class="checkbox" name="$Name" type="checkbox" value="$Value"<% if $isChecked %> checked="checked"<% end_if %><% if $isDisabled %> disabled="disabled"<% end_if %>>
-                            $Title
-                        </label>
-                    </div>
-                    <% if $Up.HasColumns && $MultipleOf($Up.PerColumn) %></div><div class="$Up.ColumnClasses"><% end_if %>                                    
-                <% end_loop %>
-                </div>
-            </div>
-        <% else %>
-            <% loop $Options %>
-                <div class="checkbox <% if $Up.Inline %>inline<% end_if %>">
-                    <label>
-                        <input id="$ID" class="checkbox" name="$Name" type="checkbox" value="$Value"<% if $isChecked %> checked="checked"<% end_if %><% if $isDisabled %> disabled="disabled"<% end_if %>>
-                        $Title
-                    </label>
-                </div>                
-            <% end_loop %>
-        <% end_if %>
-    <% else %>
-        <div>No options available</div>
-    <% end_if %>
-</div>
\ No newline at end of file
diff --git a/templates/BootstrapFieldHolder.ss b/templates/BootstrapFieldHolder.ss
deleted file mode 100644
index 51fc574..0000000
--- a/templates/BootstrapFieldHolder.ss
+++ /dev/null
@@ -1,17 +0,0 @@
-<div id="$Name" class="field $extraClass $HolderClasses" $HolderAttributes <% if DisplayLogic %>data-display-logic-masters="$DisplayLogicMasters"<% end_if %>>
-    <label class="control-label $labelClasses" for="$ID">$Title</label>
-    <div class="controls $inputClasses">
-        $Field
-
-        <% if HelpText %>
-        <p class="help-block">$HelpText</p>
-        <% end_if %>
-        <% if InlineHelpText %>
-        <span class="help-inline">$InlineHelpText</span>
-        <% end_if %>
-    </div>
-    <% if DisplayLogic %>
-    <div class="display-logic-eval">$DisplayLogic</div>
-    <% end_if %>
-</div>
-
diff --git a/templates/BootstrapOptionsetField.ss b/templates/BootstrapOptionsetField.ss
deleted file mode 100644
index 3af597a..0000000
--- a/templates/BootstrapOptionsetField.ss
+++ /dev/null
@@ -1,14 +0,0 @@
-<div $AttributesHTML>       
-        <% if $Options.Count %>
-            <% loop $Options %>
-                <div class="radio <% if $Top.Inline %>inline<% end_if %>">
-                    <label>
-                        <input id="$ID" class="radio" name="$Name" type="radio" value="$Value"<% if $isChecked %> checked<% end_if %><% if $isDisabled %> disabled<% end_if %>>
-                        $Title
-                    </label>
-                </div>
-            <% end_loop %>
-        <% else %>
-            <li>No options available</li>
-        <% end_if %>
-</div>
\ No newline at end of file
diff --git a/templates/BootstrapTextField_holder.ss b/templates/BootstrapTextField_holder.ss
deleted file mode 100644
index c4a66c5..0000000
--- a/templates/BootstrapTextField_holder.ss
+++ /dev/null
@@ -1,23 +0,0 @@
-<div id="$Name" class="field $extraClass $HolderClasses" $HolderAttributes <% if DisplayLogic %>data-display-logic-masters="$DisplayLogicMasters"<% end_if %>>
-    <label class="control-label $labelClasses" for="$ID">$Title</label>
-    <div class="controls $inputClasses">
-        <% if AppendedText || PrependedText %>
-        	<div class="<% if AppendedText %>$input-append<% end_if %><% if PrependedText %> input-prepend<% end_if %>">
-        		<% if PrependedText %><span class="add-on">$PrependedText</span><% end_if %>$Field<% if AppendedText %><span class="add-on">$AppendedText</span><% end_if %>
-        	</div>
-        <% else %>
-          $Field
-        <% end_if %>
-
-        <% if HelpText %>
-        <p class="help-block">$HelpText</p>
-        <% end_if %>
-        <% if InlineHelpText %>
-        <span class="help-inline">$InlineHelpText</span>
-        <% end_if %>
-
-    </div>
-    <% if DisplayLogic %>
-    <div class="display-logic-eval">$DisplayLogic</div>
-    <% end_if %>
-</div>
diff --git a/templates/Includes/CheckboxField_holder.ss b/templates/Includes/CheckboxField_holder.ss
deleted file mode 100644
index 6a1349d..0000000
--- a/templates/Includes/CheckboxField_holder.ss
+++ /dev/null
@@ -1,11 +0,0 @@
-<div id="$Name" class="field<% if extraClass %> $extraClass<% end_if %>" <% if DisplayLogic %>data-display-logic-masters="$DisplayLogicMasters"<% end_if %>>
-	$Field
-	<label class="right" for="$ID">$Title</label>
-	<% if Message %><span class="message $MessageType">$Message</span><% end_if %>
-	<% if Description %><span class="description">$Description</span><% end_if %>
-
-	<% if DisplayLogic %>
-	<div class="display-logic-eval">$DisplayLogic</div>
-	<% end_if %>
-
-</div>
diff --git a/templates/Includes/CompositeField_holder.ss b/templates/Includes/CompositeField_holder.ss
deleted file mode 100644
index e28fcce..0000000
--- a/templates/Includes/CompositeField_holder.ss
+++ /dev/null
@@ -1,21 +0,0 @@
-<$Tag class="CompositeField $extraClass <% if ColumnCount %>multicolumn<% end_if %>" <% if DisplayLogic %>data-display-logic-masters="$DisplayLogicMasters"<% end_if %>>
-	<% if $Tag == 'fieldset' && $Legend %>
-		<legend>$Legend</legend>
-	<% end_if %>
-	
-	<% loop FieldList %>
-		<% if ColumnCount %>
-			<div class="column-{$ColumnCount} $FirstLast">
-				$FieldHolder
-			</div>
-		<% else %>
-			$FieldHolder
-		<% end_if %>
-	<% end_loop %>
-
-	<% if Description %><span class="description">$Description</span><% end_if %>
-	
-	<% if DisplayLogic %>
-		<div class="display-logic-eval">$DisplayLogic</div>
-	<% end_if %>
-</$Tag>
diff --git a/templates/Includes/DisplayLogicWrapper_holder.ss b/templates/Includes/DisplayLogicWrapper_holder.ss
deleted file mode 100644
index 2f3858d..0000000
--- a/templates/Includes/DisplayLogicWrapper_holder.ss
+++ /dev/null
@@ -1,23 +0,0 @@
-<$Tag class="field WrapperField $extraClass <% if ColumnCount %>multicolumn<% end_if %>" <% if DisplayLogic %>data-display-logic-masters="$DisplayLogicMasters"<% end_if %>>
-
-    <% if $Tag == 'fieldset' && $Legend %>
-        <legend>$Legend</legend>
-    <% end_if %>
-
-    <% loop FieldList %>
-        <% if ColumnCount %>
-            <div class="column-{$ColumnCount} $FirstLast">
-                $FieldHolder
-            </div>
-        <% else %>
-            $FieldHolder
-        <% end_if %>
-    <% end_loop %>
-
-    <% if Description %><span class="description">$Description</span><% end_if %>
-
-    <% if DisplayLogic %>
-        <div class="display-logic-eval">$DisplayLogic</div>
-    <% end_if %>
-
-</$Tag>
\ No newline at end of file
diff --git a/templates/Includes/FormField_holder.ss b/templates/Includes/FormField_holder.ss
deleted file mode 100644
index baa5d59..0000000
--- a/templates/Includes/FormField_holder.ss
+++ /dev/null
@@ -1,13 +0,0 @@
-<div id="$Name" class="field<% if extraClass %> $extraClass<% end_if %>" <% if DisplayLogic %>data-display-logic-masters="$DisplayLogicMasters"<% end_if %>>
-	<% if Title %><label class="left" for="$ID">$Title</label><% end_if %>
-	<div class="middleColumn">
-		$Field
-	</div>
-	<% if RightTitle %><label class="right" for="$ID">$RightTitle</label><% end_if %>
-	<% if Message %><span class="message $MessageType">$Message</span><% end_if %>
-    <% if $Description %><span class="description">$Description</span><% end_if %>
-
-	<% if DisplayLogic %>
-	<div class="display-logic-eval">$DisplayLogic</div>
-	<% end_if %>
-</div>