diff --git a/code/CMSSubTreeAdmin.php b/code/CMSSubTreeAdmin.php
deleted file mode 100644
index 68e4fcf..0000000
--- a/code/CMSSubTreeAdmin.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * Test a subtree-admin that only shows the children of a FTPageHolder
- */
-class CMSSubTreeAdmin extends CMSPagesController {
-	// These variables are 2.3-specific; in 2.2.x you will need to edit _config.php
-	static $url_segment = 'subtree';
-	static $menu_title = 'FT Pages';
-	
-	function SiteTreeAsUL() {
-		// This piece of code just gets us a root ID to use
-		$ftRoot = DataObject::get_one("FTPageHolder");
-		if(!$ftRoot) {
-			$ftRoot = new FTPageHolder();
-			$ftRoot->write();
-		}
-		
-		// ftRoot->ID is your root node
-		$siteTree = $this->getSiteTreeFor("SiteTree", $ftRoot->ID);
-		
-		// This code is copied from getSiteTreeFor(), because getSiteTreeFor has it hard-coded to only generate if rootID = 0
-		$rootLink = $this->Link() . '0';
-		if($this->hasMethod('getCMSTreeTitle')) $treeTitle = $this->getCMSTreeTitle();
-		else $treeTitle =  _t('LeftAndMain.SITECONTENTLEFT',"Site Content",PR_HIGH,'Root node on left');
-		$siteTree = "<ul id=\"sitetree\" class=\"tree unformatted\"><li id=\"record-0\" class=\"Root nodelete\"><a href=\"$rootLink\"><strong>$treeTitle</strong></a>"
-			. $siteTree . "</li></ul>";
-
-		return $siteTree;
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/code/Client.php b/code/Client.php
deleted file mode 100644
index 4848192..0000000
--- a/code/Client.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-class Client extends DataObject {
-	static $db = array(
-		"Name" => "Varchar",
-		"Notes" => "HTMLText",
-	);
-	static $many_many = array(
-		"Contacts" => "Contact",
-	);
-	static $belongs_many_many = array(
-		"Projects" => "Project",
-	);
-}
-
-?>
\ No newline at end of file
diff --git a/code/Contact.php b/code/Contact.php
deleted file mode 100644
index a9a01d5..0000000
--- a/code/Contact.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-class Contact extends DataObject {
-	static $db = array(
-		"FirstName" => "Varchar",
-		"Surname" => "Varchar",
-		"Email" => "Varchar",
-	);
-	static $belongs_many_many = array(
-		"Clients" => "Client",
-	);
-}
-
-?>
\ No newline at end of file
diff --git a/code/Developer.php b/code/Developer.php
deleted file mode 100644
index 905242e..0000000
--- a/code/Developer.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-class Developer extends DataObject {
-	static $db = array(
-		"FirstName" => "Varchar",
-		"Surname" => "Varchar",
-		"Email" => "Varchar",
-		"Username" => "Varchar",
-	);
-	static $belongs_many_many = array(
-		"Projects" => "Project",
-	);
-}
-
-?>
\ No newline at end of file
diff --git a/code/FTPage.php b/code/FTPage.php
deleted file mode 100644
index 4e55749..0000000
--- a/code/FTPage.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-class FTPage extends Page {
-	
-}
\ No newline at end of file
diff --git a/code/FTPageHolder.php b/code/FTPageHolder.php
deleted file mode 100644
index 0dee731..0000000
--- a/code/FTPageHolder.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-class FTPageHolder extends Page {
-	static $default_child = 'FTPage';
-	static $allowed_children = array('FTPage');
-}
\ No newline at end of file
diff --git a/code/Project.php b/code/Project.php
deleted file mode 100644
index f8a36fe..0000000
--- a/code/Project.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-class Project extends DataObject {
-	static $db = array(
-		"Name" => "Varchar",
-	);
-	static $many_many = array(
-		"Clients" => "Client",
-		"Developers" => "Developer",
-	);
-}
-
-?>
\ No newline at end of file
diff --git a/code/RelationFieldsTestPage.php b/code/RelationFieldsTestPage.php
index 71885a7..c0c791e 100644
--- a/code/RelationFieldsTestPage.php
+++ b/code/RelationFieldsTestPage.php
@@ -25,18 +25,13 @@ class RelationFieldsTestPage extends TestPage {
 		// TODO Fix legacy relation CTFs in 3.0
 
 		// $fields->addFieldToTab("Root.HasOneCTF", 
-		// 	new HasOneComplexTableField($this, "FavouriteItem", "TestCTFItem", array(
-		// 		"Title" => "Item Title", 
-		// 		"Author" => "Item Author")));
+		// 	new HasOneComplexTableField($this, "HasOneCompany");
 
 		// $fields->addFieldToTab("Root.HasManyCTF", 
-		// 	new HasManyComplexTableField($this, "Items", "TestCTFItem", array(
-		// 		"Title" => "Item Title", 
-		// 		"Author" => "Item Author")));
+		// 	new HasManyComplexTableField($this, "HasManyCompanies");
 
 		// $fields->addFieldToTab("Root.ManyManyCTF", 
-		// 	new ManyManyComplexTableField($this, "CheckboxSet", "TestCategory", array(
-		// 		"Title" => "Item Title")));
+		// 	new ManyManyComplexTableField($this, "ManyManyCompanies");
 
 
 //		$fields->addFieldToTab("Root.Tests.ComplexTableField", 
@@ -49,6 +44,4 @@ class RelationFieldsTestPage extends TestPage {
 
 class RelationFieldsTestPage_Controller extends TestPage_Controller {
 	
-}
-
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/code/TestModelAdmin.php b/code/TestModelAdmin.php
index 74b070d..3099f89 100644
--- a/code/TestModelAdmin.php
+++ b/code/TestModelAdmin.php
@@ -2,13 +2,11 @@
 
 class TestModelAdmin extends ModelAdmin {
 	static $url_segment = 'test';
-	static $menu_title = 'Test MdAdm';
+	static $menu_title = 'Test ModelAdmin';
 
 	public static $managed_models = array(
-		"Client",
-		"Contact",
-		"Project",
-		"Developer",
+		"Company",
+		"Employee",
 	);
 
 }