diff --git a/apps/files_external/lib/Lib/Storage/AmazonS3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php
index 3cdff1d6f4..b96950cca9 100644
--- a/apps/files_external/lib/Lib/Storage/AmazonS3.php
+++ b/apps/files_external/lib/Lib/Storage/AmazonS3.php
@@ -185,7 +185,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 
 	/**
 	 * Updates old storage ids (v0.2.1 and older) that are based on key and secret to new ones based on the bucket name.
-	 * TODO Do this in an update.php. requires iterating over all users and loading the mount.json from their home
+	 * TODO Do this in a repair step. requires iterating over all users and loading the mount.json from their home
 	 *
 	 * @param array $params
 	 */
diff --git a/core/Command/App/CheckCode.php b/core/Command/App/CheckCode.php
index 40d632a1ad..2480e1fa45 100644
--- a/core/Command/App/CheckCode.php
+++ b/core/Command/App/CheckCode.php
@@ -157,8 +157,6 @@ class CheckCode extends Command implements CompletionAwareInterface {
 			$errors = array_merge($errors, $schemaErrors['errors']);
 		}
 
-		$this->analyseUpdateFile($appId, $output);
-
 		if (empty($errors)) {
 			$output->writeln('<info>App is compliant - awesome job!</info>');
 			return 0;
@@ -168,22 +166,6 @@ class CheckCode extends Command implements CompletionAwareInterface {
 		}
 	}
 
-	/**
-	 * @param string $appId
-	 * @param $output
-	 */
-	private function analyseUpdateFile($appId, OutputInterface $output) {
-		$appPath = \OC_App::getAppPath($appId);
-		if ($appPath === false) {
-			throw new \RuntimeException("No app with given id <$appId> known.");
-		}
-
-		$updatePhp = $appPath . '/appinfo/update.php';
-		if (file_exists($updatePhp)) {
-			$output->writeln("<info>Deprecated file found: $updatePhp - please use repair steps</info>");
-		}
-	}
-
 	/**
 	 * @param string $optionName
 	 * @param CompletionContext $context
diff --git a/lib/private/legacy/OC_App.php b/lib/private/legacy/OC_App.php
index abc70cc1e2..0b9ae8c8c5 100644
--- a/lib/private/legacy/OC_App.php
+++ b/lib/private/legacy/OC_App.php
@@ -990,11 +990,6 @@ class OC_App {
 		\OC::$server->getAppManager()->clearAppsCache();
 		\OC::$server->getAppManager()->getAppVersion($appId, false);
 
-		// run upgrade code
-		if (file_exists($appPath . '/appinfo/update.php')) {
-			self::loadApp($appId);
-			include $appPath . '/appinfo/update.php';
-		}
 		self::setupBackgroundJobs($appData['background-jobs']);
 
 		//set remote/public handlers