diff --git a/lib/templatelayout.php b/lib/templatelayout.php
index 966d02011f..4f26775b48 100644
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -12,7 +12,6 @@ class OC_TemplateLayout extends OC_Template {
 
 		if( $renderas == 'user' ) {
 			parent::__construct( 'core', 'layout.user' );
-			$this->assign('searchurl',OC_Helper::linkTo( 'search', 'index.php' ), false);
 			if(in_array(OC_APP::getCurrentApp(),array('settings','admin','help'))!==false) {
 				$this->assign('bodyid','body-settings', false);
 			}else{
diff --git a/search/index.php b/search/index.php
deleted file mode 100644
index 9c515ff3dd..0000000000
--- a/search/index.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
-* ownCloud - ajax frontend
-*
-* @author Robin Appelman
-* @copyright 2010 Robin Appelman icewind1991@gmail.com
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-
-// Init owncloud
-require_once '../lib/base.php';
-
-// Check if we are a user
-OC_Util::checkLoggedIn();
-
-// Load the files we need
-OC_Util::addStyle( 'search', 'search' );
-
-$query=(isset($_POST['query']))?$_POST['query']:'';
-if($query) {
-	$results=OC_Search::search($query);
-}else{
-	OC_Util::redirectToDefaultPage();
-}
-
-$resultTypes=array();
-foreach($results as $result) {
-	if(!isset($resultTypes[$result->type])) {
-		$resultTypes[$result->type]=array();
-	}
-	$resultTypes[$result->type][]=$result;
-}
-
-$tmpl = new OC_Template( 'search', 'index', 'user' );
-$tmpl->assign('resultTypes', $resultTypes);
-$tmpl->printPage();
diff --git a/search/templates/index.php b/search/templates/index.php
deleted file mode 100644
index 7241553e7f..0000000000
--- a/search/templates/index.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<ul id='searchresults'>
-	<?php foreach($_['resultTypes'] as $resultType):?>
-		<li class='resultHeader'>
-			<p><?php echo $resultType[0]->type?></p>
-		</li>
-		<?php foreach($resultType as $result):?>
-			<li class='result'>
-				<p>
-					<a href='<?php echo $result->link?>' title='<?php echo $result->name?>'><?php echo $result->name?></a>
-				</p>
-				<p>
-					<?php echo $result->text?>
-				</p>
-			</li>
-		<?php endforeach;?>
-	<?php endforeach;?>
-</ul>