diff --git a/apps/files/command/scan.php b/apps/files/command/scan.php
index f334f29a93..25ab70af36 100644
--- a/apps/files/command/scan.php
+++ b/apps/files/command/scan.php
@@ -58,7 +58,6 @@ class Scan extends Command {
 
 	protected function execute(InputInterface $input, OutputInterface $output) {
 		if ($input->getOption('all')) {
-			\OC_App::loadApps('authentication');
 			$users = $this->userManager->search('');
 		} else {
 			$users = $input->getArgument('user_id');
diff --git a/core/ajax/share.php b/core/ajax/share.php
index 3f04e1e4ad..e667d9b5fa 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -21,7 +21,6 @@
 
 OC_JSON::checkLoggedIn();
 OCP\JSON::callCheck();
-OC_App::loadApps();
 
 $defaults = new \OCP\Defaults();
 
diff --git a/search/ajax/search.php b/search/ajax/search.php
index f0ca5752b9..0cc1f9d30c 100644
--- a/search/ajax/search.php
+++ b/search/ajax/search.php
@@ -23,7 +23,6 @@
 
 // Check if we are a user
 OC_JSON::checkLoggedIn();
-OC_App::loadApps();
 
 $query=(isset($_GET['query']))?$_GET['query']:'';
 if($query) {
diff --git a/settings/admin.php b/settings/admin.php
index 80b038d2ef..5e04f34367 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -6,7 +6,6 @@
  */
 
 OC_Util::checkAdminUser();
-OC_App::loadApps();
 
 OC_Util::addStyle( "settings", "settings" );
 OC_Util::addScript( "settings", "admin" );
diff --git a/settings/apps.php b/settings/apps.php
index 96b6d21b50..6fd2efc201 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -22,7 +22,6 @@
 */
 
 OC_Util::checkAdminUser();
-OC_App::loadApps();
 
 // Load the files we need
 OC_Util::addStyle( "settings", "settings" );
diff --git a/settings/changepassword/controller.php b/settings/changepassword/controller.php
index e8c2a1943f..9f1e732996 100644
--- a/settings/changepassword/controller.php
+++ b/settings/changepassword/controller.php
@@ -8,9 +8,6 @@ class Controller {
 		\OC_JSON::callCheck();
 		\OC_JSON::checkLoggedIn();
 
-		// Manually load apps to ensure hooks work correctly (workaround for issue 1503)
-		\OC_App::loadApps();
-
 		$username = \OC_User::getUser();
 		$password = isset($_POST['personal-password']) ? $_POST['personal-password'] : null;
 		$oldPassword = isset($_POST['oldpassword']) ? $_POST['oldpassword'] : '';
@@ -32,9 +29,6 @@ class Controller {
 		\OC_JSON::callCheck();
 		\OC_JSON::checkLoggedIn();
 
-		// Manually load apps to ensure hooks work correctly (workaround for issue 1503)
-		\OC_App::loadApps();
-
 		if (isset($_POST['username'])) {
 			$username = $_POST['username'];
 		} else {
diff --git a/settings/help.php b/settings/help.php
index 88693939b8..301f50592a 100644
--- a/settings/help.php
+++ b/settings/help.php
@@ -6,7 +6,6 @@
  */
 
 OC_Util::checkLoggedIn();
-OC_App::loadApps();
 
 // Load the files we need
 OC_Util::addStyle( "settings", "settings" );
diff --git a/settings/personal.php b/settings/personal.php
index cf1a496bdf..be1aa6400b 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -6,7 +6,6 @@
  */
 
 OC_Util::checkLoggedIn();
-OC_App::loadApps();
 
 $defaults = new OC_Defaults(); // initialize themable default strings and urls
 
diff --git a/settings/settings.php b/settings/settings.php
index 1e05452ec4..c08732fcf6 100644
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -6,7 +6,6 @@
  */
 
 OC_Util::checkLoggedIn();
-OC_App::loadApps();
 
 OC_Util::addStyle( 'settings', 'settings' );
 OC_App::setActiveNavigationEntry( 'settings' );
diff --git a/settings/users.php b/settings/users.php
index 2f1c63a0b5..f09d0e90d3 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -6,7 +6,6 @@
  */
 
 OC_Util::checkSubAdminUser();
-OC_App::loadApps();
 
 // We have some javascript foo!
 OC_Util::addScript( 'settings', 'users' );