diff --git a/code/formfields/CommentTableField.php b/code/formfields/CommentTableField.php
deleted file mode 100644
index f380f2f..0000000
--- a/code/formfields/CommentTableField.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/**
- * Special kind of ComplexTableField for managing comments.
- *
- * @package comments
- */
-class CommentTableField extends ComplexTableField {
-	protected $template = "CommentTableField";
-	protected $mode;
-	
-	function __construct($controller, $name, $sourceClass, $mode, $fieldList, $detailFormFields = null, $sourceFilter = "", $sourceSort = "Created", $sourceJoin = "") {
-		$this->mode = $mode;
-		
-		Session::set('CommentsSection', $mode);
-		
-		parent::__construct($controller, $name, $sourceClass, $fieldList, $detailFormFields, $sourceFilter, $sourceSort, $sourceJoin);
-		
-		$this->Markable = true;
-		
-		// Note: These keys have special behaviour associated through TableListField.js
-		$this->selectOptions = array(
-			'all' => _t('CommentTableField.SELECTALL', 'All'),
-			'none' => _t('CommentTableField.SELECTNONE', 'None')
-		);
-		
-		// search
-		$search = isset($_REQUEST['CommentSearch']) ? Convert::raw2sql($_REQUEST['CommentSearch']) : null;
-		if(!empty($_REQUEST['CommentSearch'])) {
-			$this->sourceFilter[] = "( \"Name\" LIKE '%$search%' OR \"Comment\" LIKE '%$search%')";
-		}
-	}
-	
-	function FieldHolder() {
-		$ret = parent::FieldHolder();
-		
-		Requirements::javascript(CMS_DIR . '/javascript/CommentTableField.js');
-		
-		return $ret;
-	}
-	
-	function Items() {
-		$this->sourceItems = $this->sourceItems();
-		
-		if(!$this->sourceItems) {
-			return null;
-		}
-		
-		$pageStart = (isset($_REQUEST['ctf'][$this->Name()]['start']) && is_numeric($_REQUEST['ctf'][$this->Name()]['start'])) ? $_REQUEST['ctf'][$this->Name()]['start'] : 0;
-		$this->sourceItems->setPageLimits($pageStart, $this->pageSize, $this->totalCount);
-		
-		$output = new DataObjectSet();
-		foreach($this->sourceItems as $pageIndex=>$item) {
-			$output->push(Object::create('CommentTableField_Item',$item, $this, $pageStart+$pageIndex));
-		}
-		return $output;
-	}
-	
-	function HasSpamButton() {
-		return $this->mode == 'approved' || $this->mode == 'unmoderated';
-	}
-	
-	function HasApproveButton() {
-		return $this->mode == 'unmoderated';
-	}
-	
-	function HasHamButton() {
-		return $this->mode == 'spam';
-	}
-
-	function SearchForm() {
-		$query = isset($_GET['CommentSearch']) ? $_GET['CommentSearch'] : null;
-		
-		$searchFields = new FieldGroup(
-			new TextField('CommentSearch', _t('CommentTableField.SEARCH', 'Search'), $query),
-			new HiddenField("ctf[ID]",'',$this->mode),
-			new HiddenField('CommentFieldName','',$this->name)
-		);
-		
-		$actionFields = new LiteralField('CommentFilterButton','<input type="submit" name="CommentFilterButton" value="'. _t('CommentTableField.FILTER', 'Filter') .'" id="CommentFilterButton"/>');
-		
-		$fieldContainer = new FieldGroup(
-			$searchFields,
-			$actionFields
-		);
-		
-		return $fieldContainer->FieldHolder();
-	}
-}
-
-/**
- * Single row of a {@link CommentTableField}
- *
- * @package comments
- */
-class CommentTableField_Item extends ComplexTableField_Item {
-	function HasSpamButton() {
-		return $this->parent()->HasSpamButton();
-	}
-	
-	function HasApproveButton() {
-		return $this->parent()->HasApproveButton();
-	}
-	
-	function HasHamButton() {
-		return $this->parent()->HasHamButton();
-	}
-}
\ No newline at end of file
diff --git a/code/forms/CommentForm.php b/code/forms/CommentForm.php
deleted file mode 100644
index 2a1edff..0000000
--- a/code/forms/CommentForm.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * Comment form used to make comments 
- *
- * @package comments
- */
-
-class CommentForm extends Form {
-
-	private static $ownerClass = false;
-	/**
-	 * Returns a create comment form
-	 *
-	 * @return Form
-	 */
-	function __construct($controller, $name) {
-		
-
-	}
-	
-	
-}