diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index 4138fc2b39..e1c6e8f2eb 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -190,7 +190,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	
 	public function filesize($path) {
 		if ($path == "" || $path == "/" || $this->is_dir($path)) {
-			return $this->getFolderSize($path);
+			return 0;
 		} else {
 			$source = $this->getSource($path);
 			if ($source) {
@@ -200,35 +200,6 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		}
 	}
 
-	public function getFolderSize($path) {
-		return 0; //depricated
-	}
-	
-	private function calculateFolderSize($path) {
-		if ($this->is_file($path)) {
-			$path = dirname($path);
-		}
-		$size = 0;
-		if ($dh = $this->opendir($path)) {
-			while (($filename = readdir($dh)) !== false) {
-				if ($filename != "." && $filename != "..") {
-					$subFile = $path."/".$filename;
-					if ($this->is_file($subFile)) {
-						$size += $this->filesize($subFile);
-					} else {
-						$size += $this->getFolderSize($subFile);
-					}
-				}
-			}
-			if ($size > 0) {
-				$dbpath = rtrim($this->datadir.$path, "/");
-// 				$query = OCP\DB::prepare("INSERT INTO *PREFIX*foldersize VALUES(?,?)");
-// 				$result = $query->execute(array($dbpath, $size));
-			}
-		}
-		return $size;
-	}
-
 	private function clearFolderSizeCache($path) {
 		$path = rtrim($path, "/");
 		$path = preg_replace('{(/)\1+}', "/", $path);
diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index b2eba05151..0ed184c802 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -4,7 +4,6 @@
  */
 class OC_Filestorage_Local extends OC_Filestorage_Common{
 	protected $datadir;
-	private static $mimetypes=null;
 	public function __construct($arguments){
 		$this->datadir=$arguments['datadir'];
 		if(substr($this->datadir,-1)!=='/'){
@@ -41,7 +40,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{
 	}
 	public function filesize($path){
 		if($this->is_dir($path)){
-			return $this->getFolderSize($path);
+			return 0;
 		}else{
 			return filesize($this->datadir.$path);
 		}
@@ -186,15 +185,6 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{
 		return $files;
 	}
 
-	/**
-	 * @brief get the size of folder and it's content
-	 * @param string $path file path
-	 * @return int size of folder and it's content
-	 */
-	public function getFolderSize($path){
-		return 0;//depricated, use OC_FileCach instead
-	}
-
 	/**
 	 * check if a file or folder has been updated since $time
 	 * @param int $time