diff --git a/forms/ComplexTableField.php b/forms/ComplexTableField.php
index f3e8cff5c..26e17396d 100755
--- a/forms/ComplexTableField.php
+++ b/forms/ComplexTableField.php
@@ -40,7 +40,7 @@ class ComplexTableField extends TableListField {
     
 	protected $detailFormFields;
 	
-	protected $viewAction, $sourceJoin, $sourceItems, $unpagedSourceItems;
+	protected $viewAction, $sourceJoin, $sourceItems;
 
 	/**
 	 * @var Controller
@@ -755,9 +755,7 @@ class ComplexTableField_ItemRequest extends RequestHandler {
 		if(!isset($_REQUEST['ctf']['start']) || !is_numeric($_REQUEST['ctf']['start']) || $_REQUEST['ctf']['start'] == 0) {
 			return null;
 		}
-		
-		// We never use $item afterwards in the function, where we have it here? disable it!
-		//$item = $this->unpagedSourceItems->First();
+
 		$start = 0;
 		return Controller::join_links($this->Link(), "$this->methodName?ctf[start]={$start}");
 	}
@@ -767,8 +765,6 @@ class ComplexTableField_ItemRequest extends RequestHandler {
 			return null;
 		}
 		
-		// We never use $item afterwards in the function, where we have it here? disable it!
-		// $item = $this->unpagedSourceItems->Last();
 		$start = $this->totalCount - 1;
 		return Controller::join_links($this->Link(), "$this->methodName?ctf[start]={$start}");
 	}
@@ -778,9 +774,6 @@ class ComplexTableField_ItemRequest extends RequestHandler {
 			return null;
 		}
 
-		// We never use $item afterwards in the function, where we have it here? disable it!
-		//$item = $this->unpagedSourceItems->getIterator()->getOffset($_REQUEST['ctf']['start'] + 1);
-
 		$start = $_REQUEST['ctf']['start'] + 1;
 		return Controller::join_links($this->Link(), "$this->methodName?ctf[start]={$start}");
 	}
@@ -790,9 +783,6 @@ class ComplexTableField_ItemRequest extends RequestHandler {
 			return null;
 		}
 
-		// We never use $item afterwards in the function, where we have it here? disable it!
-		//$item = $this->unpagedSourceItems->getIterator()->getOffset($_REQUEST['ctf']['start'] - 1);
-
 		$start = $_REQUEST['ctf']['start'] - 1;
 		return Controller::join_links($this->Link(), "$this->methodName?ctf[start]={$start}");
 	}
@@ -817,7 +807,6 @@ class ComplexTableField_ItemRequest extends RequestHandler {
         }
 		for($i = $offset;$i <= $offset + $this->pageSize && $i <= $this->totalCount;$i++) {
             $start = $i - 1;
-			$item = $this->unpagedSourceItems->getIterator()->getOffset($i-1);
 			$links['link'] = Controller::join_links($this->Link() . "$this->methodName?ctf[start]={$start}");
             $links['number'] = $i;
             $links['active'] = $i == $currentItem ? false : true;