diff --git a/plugins/generalmetadata/GeneralMetadataDashlet.php b/plugins/generalmetadata/GeneralMetadataDashlet.php
deleted file mode 100644
index cc46c31..0000000
--- a/plugins/generalmetadata/GeneralMetadataDashlet.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-/*
- * The contents of this file are subject to the KnowledgeTree Public
- * License Version 1.1.2 ("License"); You may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.knowledgetree.com/KPL
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
- * See the License for the specific language governing rights and
- * limitations under the License.
- *
- * All copies of the Covered Code must include on each user interface screen:
- *    (i) the "Powered by KnowledgeTree" logo and
- *    (ii) the KnowledgeTree copyright notice
- * in the same form as they appear in the distribution.  See the License for
- * requirements.
- * 
- * The Original Code is: KnowledgeTree Open Source
- * 
- * The Initial Developer of the Original Code is The Jam Warehouse Software
- * (Pty) Ltd, trading as KnowledgeTree.
- * Portions created by The Jam Warehouse Software (Pty) Ltd are Copyright
- * (C) 2007 The Jam Warehouse Software (Pty) Ltd;
- * All Rights Reserved.
- * Contributor( s): ______________________________________
- *
- */
-
-
-require_once(KT_LIB_DIR . '/browse/browseutil.inc.php');
-require_once(KT_LIB_DIR . '/plugins/pluginregistry.inc.php');
-require_once(KT_LIB_DIR . '/plugins/plugin.inc.php');
-
-class GeneralMetadataDashlet extends KTBaseDashlet {
-	var $oUser;
-	var $sClass = 'ktBlock';
-	
-	/**
-	 * Constructor method
-	 *
-	 * @return GeneralMetadataDashlet
-	 */
-	function GeneralMetadataDashlet(){
-		$this->sTitle = _kt('General Metadata Search');
-	}
-	
-	/**
-	 * Check to see if user is active
-	 *
-	 * @param object $oUser
-	 * @return boolean
-	 */
-	function is_active($oUser) {
-		$this->oUser = $oUser;
-		return true;
-	}
-
-	/**
-	 * Render function for template
-	 *
-	 * @return unknown
-	 */
-	function render() {
-		$oTemplating =& KTTemplating::getSingleton();
-		$oTemplate = $oTemplating->loadTemplate('GeneralMetadata/dashlet');
-		
-		$oRegistry =& KTPluginRegistry::getSingleton();
-		$oPlugin =& $oRegistry->getPlugin('ktcore.generalmetadata.plugin');
-		$url = $oPlugin->getPagePath('GeneralMetadataPage');
-
-		$aTemplateData = array(
-			'context' => $this,
-			'url' => $url,
-		);
-		return $oTemplate->render($aTemplateData);
-    }    
-}
-?>
diff --git a/plugins/generalmetadata/GeneralMetadataPage.php b/plugins/generalmetadata/GeneralMetadataPage.php
deleted file mode 100644
index d73b997..0000000
--- a/plugins/generalmetadata/GeneralMetadataPage.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-
-/*
- * The contents of this file are subject to the KnowledgeTree Public
- * License Version 1.1.2 ("License"); You may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.knowledgetree.com/KPL
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
- * See the License for the specific language governing rights and
- * limitations under the License.
- *
- * All copies of the Covered Code must include on each user interface screen:
- *    (i) the "Powered by KnowledgeTree" logo and
- *    (ii) the KnowledgeTree copyright notice
- * in the same form as they appear in the distribution.  See the License for
- * requirements.
- * 
- * The Original Code is: KnowledgeTree Open Source
- * 
- * The Initial Developer of the Original Code is The Jam Warehouse Software
- * (Pty) Ltd, trading as KnowledgeTree.
- * Portions created by The Jam Warehouse Software (Pty) Ltd are Copyright
- * (C) 2007 The Jam Warehouse Software (Pty) Ltd;
- * All Rights Reserved.
- * Contributor( s): ______________________________________
- *
- */
- 
-require_once(KT_LIB_DIR . '/plugins/plugin.inc.php');
-require_once(KT_LIB_DIR . '/plugins/pluginregistry.inc.php');
-require_once(KT_LIB_DIR . "/templating/templating.inc.php");
-require_once(KT_LIB_DIR . "/database/dbutil.inc");
-require_once(KT_LIB_DIR . "/util/ktutil.inc");
-require_once(KT_LIB_DIR . "/dispatcher.inc.php");
-require_once(KT_LIB_DIR . "/browse/Criteria.inc");
-require_once(KT_LIB_DIR . "/search/savedsearch.inc.php");
-require_once(KT_LIB_DIR . "/search/searchutil.inc.php");
-
-require_once(KT_LIB_DIR . "/browse/DocumentCollection.inc.php");
-require_once(KT_LIB_DIR . "/browse/BrowseColumns.inc.php");
-require_once(KT_LIB_DIR . "/browse/PartialQuery.inc.php");
-
-require_once(KT_LIB_DIR . '/widgets/fieldWidgets.php');
-require_once(KT_LIB_DIR . '/actions/bulkaction.php');
-
-class GeneralMetadataPage extends KTStandardDispatcher {
-
-	function do_main() {
-			$searchable_text = KTUtil::arrayGet($_POST, "fSearchableText");
-			
-            // set breadcrumbs
-            $this->aBreadcrumbs[] = array('url' => 'dashboard.php', 'name' => _kt('Dashboard'));
-			$this->aBreadcrumbs[] = array('name' => _kt('General Metadata Search'));
-			
-            $sTitle =  _kt('Search Results');
-            $this->oPage->setBreadcrumbDetails($sTitle);                            
-        	
-
-            $aCriteriaSet = array(
-            	'join'=>'AND',
-            	'subgroup'=>array(
-            		0=>array(
-            			'join'=>'AND',
-            			'values'=>array(
-            				1=>array(
-            					'data'=>array(
-            						'ktcore.criteria.generalmetadata'=>$searchable_text,
-            						'ktcore.criteria.generalmetadata_not'=>0
-            						),
-            					'type'=>'ktcore.criteria.generalmetadata'
-            				)
-            			)
-            		)
-            	)
-            );
-            
-
-        $this->browseType = "Folder";
-        $sSearch = md5(serialize($aCriteriaSet));
-        $_SESSION['boolean_search'][$sSearch] = $aCriteriaSet;
-
-        $collection = new AdvancedCollection;       
-        $oColumnRegistry = KTColumnRegistry::getSingleton();
-        $aColumns = $oColumnRegistry->getColumnsForView('ktcore.views.search');
-        $collection->addColumns($aColumns);
-        
-        // set a view option
-        $aTitleOptions = array(
-            'documenturl' => $GLOBALS['KTRootUrl'] . '/view.php',
-        );
-        $collection->setColumnOptions('ktcore.columns.title', $aTitleOptions);
-        $collection->setColumnOptions('ktcore.columns.selection', array(
-            'rangename' => 'selection',
-            'show_folders' => true,
-            'show_documents' => true,
-        ));
-        
-        $aOptions = $collection->getEnvironOptions(); // extract data from the environment
-        
-        $aOptions['return_url'] = KTUtil::addQueryStringSelf("action=performSearch&boolean_search_id=" . urlencode($sSearch));
-        $aOptions['empty_message'] = _kt("No documents or folders match this query.");
-        $aOptions['is_browse'] = true;
-                
-        $collection->setOptions($aOptions);
-        $collection->setQueryObject(new BooleanSearchQuery($aCriteriaSet));    
-    
-        $oTemplating =& KTTemplating::getSingleton();
-        $oTemplate = $oTemplating->loadTemplate("kt3/browse");
-        $aTemplateData = array(
-            "context" => $this,
-            "collection" => $collection,
-            "custom_title" => $sTitle,
-            "params" => $aParams,
-	    	"joins" => $aJoins,
-            'isEditable' => true,
-            "boolean_search" => $sSearch,
-            'bulkactions' => KTBulkActionUtil::getAllBulkActions(),
-            'browseutil' => new KTBrowseUtil(),
-            'returnaction' => 'booleanSearch',
-            'returndata' => $sSearch,
-
-        );
-        return $oTemplate->render($aTemplateData);
-	}
-}
-?>
\ No newline at end of file
diff --git a/plugins/generalmetadata/GeneralMetadataPlugin.php b/plugins/generalmetadata/GeneralMetadataPlugin.php
deleted file mode 100644
index ec3dbad..0000000
--- a/plugins/generalmetadata/GeneralMetadataPlugin.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-/*
- * The contents of this file are subject to the KnowledgeTree Public
- * License Version 1.1.2 ("License"); You may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.knowledgetree.com/KPL
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
- * See the License for the specific language governing rights and
- * limitations under the License.
- *
- * All copies of the Covered Code must include on each user interface screen:
- *    (i) the "Powered by KnowledgeTree" logo and
- *    (ii) the KnowledgeTree copyright notice
- * in the same form as they appear in the distribution.  See the License for
- * requirements.
- * 
- * The Original Code is: KnowledgeTree Open Source
- * 
- * The Initial Developer of the Original Code is The Jam Warehouse Software
- * (Pty) Ltd, trading as KnowledgeTree.
- * Portions created by The Jam Warehouse Software (Pty) Ltd are Copyright
- * (C) 2007 The Jam Warehouse Software (Pty) Ltd;
- * All Rights Reserved.
- * Contributor( s): ______________________________________
- *
- */
- 
-require_once(KT_LIB_DIR . '/plugins/plugin.inc.php');
-require_once(KT_LIB_DIR . '/plugins/pluginregistry.inc.php');
-require_once('GeneralMetadataPage.php');
-require_once(KT_LIB_DIR . '/templating/templating.inc.php');
-
- /**
-  * Tag Cloud Plugin class
-  *
-  */
- class GeneralMetadataPlugin extends KTPlugin{
-
- 	var $sNamespace = 'ktcore.generalmetadata.plugin';
- 	
- 	/**
- 	 * Constructor method for plugin
- 	 *
- 	 * @param string $sFilename
- 	 * @return GeneralMetadataPlugin
- 	 */
- 	function GeneralMetadataPlugin($sFilename = null) {
-        $res = parent::KTPlugin($sFilename);
-        $this->sFriendlyName = _kt('General Metadata Search Plugin');
-        return $res;
-    }
-    
-    /**
-     * Setup function for plugin
-     *
-     */
-    function setup() {
-    	// Register plugin components
-		$this->registerCriterion('GeneralMetadataCriterion', 'ktcore.criteria.generalmetadata', KT_LIB_DIR . '/browse/Criteria.inc');
-		$this->registerDashlet('GeneralMetadataDashlet', 'ktcore.generalmetadata.dashlet', 'GeneralMetadataDashlet.php');
-		$this->registerPage('GeneralMetadataPage', 'GeneralMetadataPage', __FILE__);
-		
-        $oTemplating =& KTTemplating::getSingleton();
-        $oTemplating->addLocation('General Metadata Search', '/plugins/generalmetadata/templates');
-    }
- }
-$oPluginRegistry =& KTPluginRegistry::getSingleton();
-$oPluginRegistry->registerPlugin('GeneralMetadataPlugin', 'ktcore.generalmetadata.plugin', __FILE__);
\ No newline at end of file
diff --git a/plugins/generalmetadata/templates/GeneralMetadata/dashlet.smarty b/plugins/generalmetadata/templates/GeneralMetadata/dashlet.smarty
deleted file mode 100644
index 6e0614b..0000000
--- a/plugins/generalmetadata/templates/GeneralMetadata/dashlet.smarty
+++ /dev/null
@@ -1,15 +0,0 @@
-<form action="{$url}" method="POST">
-<input onclick="this.focus()" type="text" name="fSearchableText" id="dashlet-search-text"
-size="15" /><input type="submit" value="{i18n}search{/i18n}"
-class="searchbutton frontpage" />
-</form>
-{if (!empty($saved_searches))}
-<hr />
-<h3>{i18n}Saved Searches{/i18n}</h3>
-{foreach item=oSearch from=$saved_searches}
-<span class="descriptiveText">{i18n}Saved Search{/i18n}: </span><a
-href="{"booleanSearch"|generateControllerUrl}&qs[action]=performSearch&qs[fSavedSearchId]={$oSearch->getId()}">{$oSearch->getName()}</a><br />
-{/foreach}
-
-
-{/if}
\ No newline at end of file