diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php
index 5b5ed113..c230934c 100644
--- a/code/controllers/CMSMain.php
+++ b/code/controllers/CMSMain.php
@@ -63,7 +63,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 		Requirements::combine_files(
 			'cmsmain.js',
 			array(
-				CMS_DIR . '/javascript/ThumbnailStripField.js',
+				// CMS_DIR . '/javascript/ThumbnailStripField.js',
 				CMS_DIR . '/javascript/CMSMain.js',
 				CMS_DIR . '/javascript/CMSMain.EditForm.js',
 				CMS_DIR . '/javascript/CMSMain.AddForm.js',
@@ -844,13 +844,6 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 		}
 	}
 	
-	/**
-	 * Return the CMS's HTML-editor toolbar
-	 */
-	public function EditorToolbar() {
-		return Object::create('HtmlEditorField_Toolbar', $this, "EditorToolbar");
-	}
-	
 	/**
 	 * @return Array
 	 */