diff --git a/core/i18nTextCollector.php b/core/i18nTextCollector.php
index 560f025b1..22cddbcb1 100644
--- a/core/i18nTextCollector.php
+++ b/core/i18nTextCollector.php
@@ -27,7 +27,7 @@
  * @uses i18nEntityProvider
  * @uses i18n
  */
-class i18nTextCollector extends Object {
+class i18nTextCollector extends BuildTask {
 	
 	protected $defaultLocale;
 	
@@ -75,13 +75,13 @@ class i18nTextCollector extends Object {
 		$entitiesByModule = array();
 		
 		//Search for and process existent modules, or use the passed one instead
-		if($restrictToModules && count($restrictToModules)) {
-			foreach($restrictToModules as $restrictToModule) {
-				$modules[] = basename($restrictToModule);
-			}
-		} else {
+		// if($restrictToModules && count($restrictToModules)) {
+		// 	foreach($restrictToModules as $restrictToModule) {
+		// 		$modules[] = basename($restrictToModule);
+		// 	}
+		// } else {
 			$modules = scandir($this->basePath);
-		}
+		// }
 
 		foreach($modules as $module) {
 			// Only search for calls in folder with a _config.php file (which means they are modules)  
diff --git a/core/model/SiteTree.php b/core/model/SiteTree.php
index ff85bd793..a5e997049 100755
--- a/core/model/SiteTree.php
+++ b/core/model/SiteTree.php
@@ -100,7 +100,6 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
 		"ImageTracking" => "File",
 		"ViewerGroups" => "Group",
 		"EditorGroups" => "Group",
-		"UsersCurrentlyEditing" => "Member",
 	);
 
 	static $belongs_many_many = array(
@@ -108,7 +107,6 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
 	);
 
 	static $many_many_extraFields = array(
-		"UsersCurrentlyEditing" => array("LastPing" => "SS_Datetime"),
 		"LinkTracking" => array("FieldName" => "Varchar"),
 		"ImageTracking" => array("FieldName" => "Varchar")
 	);
@@ -1579,7 +1577,6 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
 		$fields = new FieldSet(
 			// Add a field with a bit of metadata for concurrent editing. The fact that we're using
 			// non-standard attributes does not really matter, all modern UA's just ignore em.
-			new LiteralField("SiteTree_Alert", '<div deletedfromstage="'.((int) $this->getIsDeletedFromStage()).'" id="SiteTree_Alert"></div>'),
 			new TabSet("Root",
 				$tabContent = new TabSet('Content',
 					$tabMain = new Tab('Main',