diff --git a/templates/forms/CheckboxField_holder.ss b/templates/forms/CheckboxField_holder.ss
deleted file mode 100644
index 021a6b5..0000000
--- a/templates/forms/CheckboxField_holder.ss
+++ /dev/null
@@ -1,6 +0,0 @@
-<div data-id="$ID" class="field<% if extraClass %> $extraClass<% end_if %>">
-	$Field
-	<label class="right" for="$Name">$Title</label>
-	<% if $Message %><span class="message $MessageType">$Message</span><% end_if %>
-	<% if $Description %><span class="description">$Description</span><% end_if %>
-</div>
diff --git a/templates/forms/CheckboxSetField.ss b/templates/forms/CheckboxSetField.ss
deleted file mode 100644
index f9fb8e8..0000000
--- a/templates/forms/CheckboxSetField.ss
+++ /dev/null
@@ -1,12 +0,0 @@
-<ul data-id="$ID" class="$extraClass">
-	<% if $Options.Count %>
-		<% loop $Options %>
-			<li class="$Class">
-				<input id="$Name[$Value]" class="checkbox" name="$Name" type="checkbox" value="$Value"<% if $isChecked %> checked="checked"<% end_if %><% if $isDisabled %> disabled="disabled"<% end_if %> />
-				<label for="$Name[$Value]">$Title</label>
-			</li> 
-		<% end_loop %>
-	<% else %>
-		<li>No options available</li>
-	<% end_if %>
-</ul>
diff --git a/templates/forms/FormField_holder.ss b/templates/forms/FormField_holder.ss
deleted file mode 100644
index 811c16c..0000000
--- a/templates/forms/FormField_holder.ss
+++ /dev/null
@@ -1,9 +0,0 @@
-<div data-id="$ID" class="field<% if $extraClass %> $extraClass<% end_if %>">
-	<% if $Title %><label class="left" for="$Name">$Title</label><% end_if %>
-	<div class="middleColumn">
-		$Field
-	</div>
-	<% if $RightTitle %><label class="right" for="$Name">$RightTitle</label><% end_if %>
-	<% if $Message %><span class="message $MessageType">$Message</span><% end_if %>
-	<% if $Description %><span class="description">$Description</span><% end_if %>
-</div>