diff --git a/apps/dav/lib/CalDAV/Plugin.php b/apps/dav/lib/CalDAV/Plugin.php
index 167ea4ffd6..0d793f929b 100644
--- a/apps/dav/lib/CalDAV/Plugin.php
+++ b/apps/dav/lib/CalDAV/Plugin.php
@@ -36,8 +36,6 @@ class Plugin extends \Sabre\CalDAV\Plugin {
 			list(, $principalId) = \Sabre\Uri\split($principalUrl);
 			return self::CALENDAR_ROOT .'/' . $principalId;
 		}
-
-		return;
 	}
 
 }
diff --git a/apps/federatedfilesharing/lib/FederatedShareProvider.php b/apps/federatedfilesharing/lib/FederatedShareProvider.php
index 1025c3c4ae..6857dd48e9 100644
--- a/apps/federatedfilesharing/lib/FederatedShareProvider.php
+++ b/apps/federatedfilesharing/lib/FederatedShareProvider.php
@@ -592,7 +592,6 @@ class FederatedShareProvider implements IShareProvider {
 		// shares is a umount of a external storage. This is handled here
 		// apps/files_sharing/lib/external/manager.php
 		// TODO move this code over to this app
-		return;
 	}
 
 
@@ -934,7 +933,6 @@ class FederatedShareProvider implements IShareProvider {
 	 */
 	public function groupDeleted($gid) {
 		// We don't handle groups here
-		return;
 	}
 
 	/**
@@ -945,7 +943,6 @@ class FederatedShareProvider implements IShareProvider {
 	 */
 	public function userDeletedFromGroup($uid, $gid) {
 		// We don't handle groups here
-		return;
 	}
 
 	/**
diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php
index 287c6abff5..31df8a1895 100644
--- a/apps/sharebymail/lib/ShareByMailProvider.php
+++ b/apps/sharebymail/lib/ShareByMailProvider.php
@@ -690,7 +690,6 @@ class ShareByMailProvider implements IShareProvider {
 	 */
 	public function deleteFromSelf(IShare $share, $recipient) {
 		// nothing to do here, mail shares are only outgoing shares
-		return;
 	}
 
 	/**
@@ -981,7 +980,6 @@ class ShareByMailProvider implements IShareProvider {
 	 * @param string $gid
 	 */
 	public function groupDeleted($gid) {
-		return;
 	}
 
 	/**
@@ -991,7 +989,6 @@ class ShareByMailProvider implements IShareProvider {
 	 * @param string $gid
 	 */
 	public function userDeletedFromGroup($uid, $gid) {
-		return;
 	}
 
 	/**
diff --git a/lib/private/Files/Cache/FailedCache.php b/lib/private/Files/Cache/FailedCache.php
index 932a5e5181..b64d66dc69 100644
--- a/lib/private/Files/Cache/FailedCache.php
+++ b/lib/private/Files/Cache/FailedCache.php
@@ -71,15 +71,12 @@ class FailedCache implements ICache {
 	}
 
 	public function put($file, array $data) {
-		return;
 	}
 
 	public function insert($file, array $data) {
-		return;
 	}
 
 	public function update($id, array $data) {
-		return;
 	}
 
 	public function getId($file) {
@@ -95,19 +92,15 @@ class FailedCache implements ICache {
 	}
 
 	public function remove($file) {
-		return;
 	}
 
 	public function move($source, $target) {
-		return;
 	}
 
 	public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath) {
-		return;
 	}
 
 	public function clear() {
-		return;
 	}
 
 	public function getStatus($file) {
diff --git a/lib/private/Files/Node/Node.php b/lib/private/Files/Node/Node.php
index e00debe690..304b2ccf46 100644
--- a/lib/private/Files/Node/Node.php
+++ b/lib/private/Files/Node/Node.php
@@ -118,7 +118,6 @@ class Node implements \OCP\Files\Node {
 	}
 
 	public function delete() {
-		return;
 	}
 
 	/**
@@ -349,7 +348,6 @@ class Node implements \OCP\Files\Node {
 	}
 
 	public function getChecksum() {
-		return;
 	}
 
 	/**