diff --git a/lib/private/legacy/search.php b/lib/private/legacy/search.php
deleted file mode 100644
index d113412dc4ac3317a0ee80977de0d546e55d88fd..0000000000000000000000000000000000000000
--- a/lib/private/legacy/search.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * @author Andrew Brown <andrew@casabrown.com>
- * @author Jörn Friedrich Dreyer <jfd@butonic.de>
- * @author Morris Jobke <hey@morrisjobke.de>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program 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, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-/**
- * provides an interface to all search providers
- *
- * @deprecated use \OCP\ISearch / \OC\Search instead
- */
-class OC_Search {
-	/**
-	 * @return \OCP\ISearch
-	 */
-	private static function getSearch() {
-		return \OC::$server->getSearch();
-	}
-
-	/**
-	 * Search all providers for $query
-	 * @param string $query
-	 * @return array An array of OCP\Search\Result's
-	 */
-	public static function search($query) {
-		return self::getSearch()->search($query);
-	}
-
-	/**
-	 * Register a new search provider to search with
-	 * @param string $class class name of a OCP\Search\Provider
-	 * @param array $options optional
-	 */
-	public static function registerProvider($class, $options = array()) {
-		return self::getSearch()->registerProvider($class, $options);
-	}
-
-	/**
-	 * Remove one existing search provider
-	 * @param string $provider class name of a OCP\Search\Provider
-	 */
-	public static function removeProvider($provider) {
-		return self::getSearch()->removeProvider($provider);
-	}
-
-	/**
-	 * Remove all registered search providers
-	 */
-	public static function clearProviders() {
-		return self::getSearch()->clearProviders();
-	}
-
-}
diff --git a/lib/private/legacy/search/provider.php b/lib/private/legacy/search/provider.php
deleted file mode 100644
index e411673fe0eb11c8f58df62eff2d103c0653bdcb..0000000000000000000000000000000000000000
--- a/lib/private/legacy/search/provider.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * @author Andrew Brown <andrew@casabrown.com>
- * @author Jörn Friedrich Dreyer <jfd@butonic.de>
- * @author Morris Jobke <hey@morrisjobke.de>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program 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, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-/**
- * Class OC_Search_Provider
- *
- * @deprecated use \OCP\Search\Provider instead
- */
-abstract class OC_Search_Provider extends \OCP\Search\Provider {
-
-}
diff --git a/lib/private/legacy/search/provider/file.php b/lib/private/legacy/search/provider/file.php
deleted file mode 100644
index f895ce8e07ee327d2db2d2070711d0e935403813..0000000000000000000000000000000000000000
--- a/lib/private/legacy/search/provider/file.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * @author Andrew Brown <andrew@casabrown.com>
- * @author Jörn Friedrich Dreyer <jfd@butonic.de>
- * @author Morris Jobke <hey@morrisjobke.de>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program 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, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-/**
- * @deprecated use \OC\Search\Provider\File instead
- */
-class OC_Search_Provider_File extends \OC\Search\Provider\File {
-
-}
diff --git a/lib/private/legacy/search/result.php b/lib/private/legacy/search/result.php
deleted file mode 100644
index 73ee91f089d9d0544b5333597e3a9b7ccf7851d1..0000000000000000000000000000000000000000
--- a/lib/private/legacy/search/result.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * @author Andrew Brown <andrew@casabrown.com>
- * @author Jörn Friedrich Dreyer <jfd@butonic.de>
- * @author Morris Jobke <hey@morrisjobke.de>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program 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, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-/**
- * @deprecated use \OCP\Search\Result instead
- */
-class OC_Search_Result extends \OCP\Search\Result {
-	/**
-	 * Create a new search result
-	 * @param string $id unique identifier from application: '[app_name]/[item_identifier_in_app]'
-	 * @param string $name displayed text of result
-	 * @param string $link URL to the result within its app
-	 * @param string $type @deprecated because it is now set in \OC\Search\Result descendants
-	 */
-	public function __construct($id = null, $name = null, $link = null, $type = null) {
-		$this->id = $id;
-		$this->name = $name;
-		$this->link = $link;
-		$this->type = $type;
-	}
-}