diff --git a/apps/bookmarks/ajax/addBookmark.php b/apps/bookmarks/ajax/addBookmark.php
index 483716405a1e6f92ccf2e3de6d9c32e92acc0810..c8a64d531c9b976bc43d23db5c362309ff719c87 100644
--- a/apps/bookmarks/ajax/addBookmark.php
+++ b/apps/bookmarks/ajax/addBookmark.php
@@ -21,11 +21,6 @@
 * 
 */
 
-//no apps or filesystem
-$RUNTIME_NOSETUPFS=true;
-
- 
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
@@ -34,4 +29,4 @@ OCP\JSON::checkAppEnabled('bookmarks');
 
 require_once(OC_App::getAppPath('bookmarks').'/bookmarksHelper.php');
 $id = addBookmark($_POST['url'], $_POST['title'], $_POST['tags']);
-OCP\JSON::success(array('data' => $id));
\ No newline at end of file
+OCP\JSON::success(array('data' => $id));
diff --git a/apps/bookmarks/ajax/delBookmark.php b/apps/bookmarks/ajax/delBookmark.php
index f40f02ebab7ccd0b786bb768df5ead839c645157..ba1dfff3bed2a032df75a84c725c0cb07ab39ac0 100644
--- a/apps/bookmarks/ajax/delBookmark.php
+++ b/apps/bookmarks/ajax/delBookmark.php
@@ -21,11 +21,6 @@
 * 
 */
 
-//no apps or filesystem
-$RUNTIME_NOSETUPFS=true;
-
- 
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
diff --git a/apps/bookmarks/ajax/editBookmark.php b/apps/bookmarks/ajax/editBookmark.php
index 0b37d161af1c772041bb07caa9a539df4b62de16..ad43be064f07013ea5d219199b996418f071fa06 100644
--- a/apps/bookmarks/ajax/editBookmark.php
+++ b/apps/bookmarks/ajax/editBookmark.php
@@ -21,11 +21,6 @@
 * 
 */
 
-//no apps or filesystem
-$RUNTIME_NOSETUPFS=true;
-
- 
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
diff --git a/apps/bookmarks/ajax/recordClick.php b/apps/bookmarks/ajax/recordClick.php
index 1eee1718d1319ed248e455eec6b017f1d5f4815e..0283f09f60d003aeb0987760cef2e163a38b1261 100644
--- a/apps/bookmarks/ajax/recordClick.php
+++ b/apps/bookmarks/ajax/recordClick.php
@@ -21,11 +21,6 @@
 * 
 */
 
-//no apps or filesystem
-$RUNTIME_NOSETUPFS=true;
-
- 
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('bookmarks');
diff --git a/apps/bookmarks/ajax/updateList.php b/apps/bookmarks/ajax/updateList.php
index 4de2475d06771204649d022c738d9e51ac71ead8..cf9a2cf918332fba97c3ebd203c4661964547dbe 100644
--- a/apps/bookmarks/ajax/updateList.php
+++ b/apps/bookmarks/ajax/updateList.php
@@ -22,11 +22,6 @@
 * 
 */
 
-//no apps or filesystem
-$RUNTIME_NOSETUPFS=true;
-
- 
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('bookmarks');
diff --git a/apps/files_sharing/get.php b/apps/files_sharing/get.php
index 70a5162d382f055ad51ecf949b86ccc553070248..1d219719b2d3167b7d61dd2ce5b5daf78c69c96b 100644
--- a/apps/files_sharing/get.php
+++ b/apps/files_sharing/get.php
@@ -1,6 +1,4 @@
 <?php
-$RUNTIME_NOSETUPFS=true; //don't setup the fs yet
-
 // only need authentication apps
 $RUNTIME_APPTYPES=array('authentication');
 OC_App::loadApps($RUNTIME_APPTYPES);
diff --git a/apps/media/ajax/autoupdate.php b/apps/media/ajax/autoupdate.php
index c2dbf27a00439ae324070d3c4a202ec2c148bd5e..7329e91e21097e30af0b5dee531f67fed101f262 100644
--- a/apps/media/ajax/autoupdate.php
+++ b/apps/media/ajax/autoupdate.php
@@ -23,9 +23,8 @@
 
 header('Content-type: text/html; charset=UTF-8') ;
 
-//no apps or filesystem
+//no apps
 $RUNTIME_NOAPPS=true;
-$RUNTIME_NOSETUPFS=true;
 
  
 OCP\JSON::checkAppEnabled('media');
diff --git a/apps/remoteStorage/ajax/revokeToken.php b/apps/remoteStorage/ajax/revokeToken.php
index 322d9ed7279279f83091819dac135e1d70d02b0f..e6a68189945a32854b8e03b7b1ed5aa2f8b55dd8 100644
--- a/apps/remoteStorage/ajax/revokeToken.php
+++ b/apps/remoteStorage/ajax/revokeToken.php
@@ -25,10 +25,6 @@
 *
 */
 
-
-// Do not load FS ...
-$RUNTIME_NOSETUPFS = true;
- 
 OCP\App::checkAppEnabled('remoteStorage');
 require_once('remoteStorage/lib_remoteStorage.php');
 
diff --git a/apps/remoteStorage/auth.php b/apps/remoteStorage/auth.php
index 215dfa0742c6475c14bdc1c024b49860b9a20e41..91ca43ea0765e01cf4a157c73a37d05bcdabbb7c 100644
--- a/apps/remoteStorage/auth.php
+++ b/apps/remoteStorage/auth.php
@@ -27,9 +27,6 @@
 
 header("X-Frame-Options: Sameorigin");
 
-// Do not load FS ...
-$RUNTIME_NOSETUPFS = true;
-
 OCP\App::checkAppEnabled('remoteStorage');
 require_once('Sabre/autoload.php');
 require_once('lib_remoteStorage.php');
diff --git a/files/webdav.php b/files/webdav.php
index 53673dbeca2989e79d4394d17f2f7e55b8833c93..c19c4c6b72f2e4dc0468170553e0431967e10e57 100644
--- a/files/webdav.php
+++ b/files/webdav.php
@@ -23,8 +23,6 @@
  *
  */
 
-// Do not load FS ...
-$RUNTIME_NOSETUPFS = true;
 // only need filesystem apps
 $RUNTIME_APPTYPES=array('filesystem','authentication');
 require_once('../lib/base.php');
diff --git a/lib/base.php b/lib/base.php
index c3887dec2f8f9e5b5ce7f5632d00a6c86956d857..c5827064d758a6cada140745e38f12b8e0b0fed5 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -401,9 +401,6 @@ class OC{
 }
 
 // define runtime variables - unless this already has been done
-if( !isset( $RUNTIME_NOSETUPFS )){
-	$RUNTIME_NOSETUPFS = false;
-}
 if( !isset( $RUNTIME_NOAPPS )){
 	$RUNTIME_NOAPPS = false;
 }
diff --git a/public.php b/public.php
index 8383f36a246bf80198d5da8a3f3a1471465cbf59..0581631f41ff2c776b9480878e785c33495946c5 100644
--- a/public.php
+++ b/public.php
@@ -1,5 +1,4 @@
 <?php
-$RUNTIME_NOSETUPFS = true;
 $RUNTIME_NOAPPS = TRUE;
 require_once('lib/base.php');
 $file = OCP\CONFIG::getAppValue('core', 'public_' . strip_tags($_GET['service']));
diff --git a/remote.php b/remote.php
index 483b19555c8b556ffdb5063c87b1212634bb9d83..41d2a7ab349c32f96a972d03f945d0a666a886a0 100644
--- a/remote.php
+++ b/remote.php
@@ -1,5 +1,4 @@
 <?php
-$RUNTIME_NOSETUPFS = true;
 $RUNTIME_NOAPPS = TRUE;
 require_once('lib/base.php');
 $path_info = OC_Request::getPathInfo();