diff --git a/code/LegacyTableFieldsTestPage.php b/code/LegacyTableFieldsTestPage.php
deleted file mode 100644
index 8cd0389..0000000
--- a/code/LegacyTableFieldsTestPage.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-class LegacyTableFieldsTestPage extends TestPage {
-
-	function getCMSFields() {
-		$fields = parent::getCMSFields();
-
-		$tf = new TableListField('CompaniesTF', 'Company');
-		$tf->setShowPagination(true);
-		$ctf = new ComplexTableField($this, 'CompaniesCTF', 'Company');
-		
-		$fields->addFieldsToTab('Root.Fields', array(
-			$tf,
-			$ctf
-		));
-
-		return $fields;
-	}
-}
-
-class LegacyTableFieldsTestPage_Controller extends TestPage_Controller {
-	
-}
diff --git a/code/RelationFieldsTestPage.php b/code/RelationFieldsTestPage.php
index 15d7f00..f62511c 100644
--- a/code/RelationFieldsTestPage.php
+++ b/code/RelationFieldsTestPage.php
@@ -32,10 +32,6 @@ class RelationFieldsTestPage extends TestPage {
 			TreeMultiselectField::create('ManyManyPages', 'ManyManyPages (with search)', 'SiteTree')->setShowSearch(true)
 		));
 
-//		$fields->addFieldToTab("Root.Tests.ComplexTableField", 
-//			new CheckboxSetField("CheckboxSet", "CheckboxSetField", TestCategory::map()));
-//		$fields->addFieldToTab("Root.Tests.CheckboxSet", new CheckboxSetField("CheckboxSet", "CheckboxSetField", TestCategory::map()));
-
 		return $fields;
 	}
 }
diff --git a/code/TestCTFItem.php b/code/TestCTFItem.php
deleted file mode 100644
index 475aa46..0000000
--- a/code/TestCTFItem.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * A data type that is related 1-many to RelationFieldsTestPage, for testing purposes
- */
-class TestCTFItem extends DataObject {
-	static $db = array(
-		"Title" => "Varchar",
-		"Author" => "Varchar",
-		"Description" => "Text",
-	);
-	static $has_one = array(
-		"Parent" => "RelationFieldsTestPage",
-	);
-	
-	/**
-	 * Returns a dropdown map of all objects of this class
-	 */
-	static function map() {
-		return DataObject::get('TestCategory')->toDropdownMap();
-	}
-
-}
-
-?>
\ No newline at end of file