diff --git a/lib/Controller/BoardController.php b/lib/Controller/BoardController.php
index 67d13c92f..f3399d81e 100644
--- a/lib/Controller/BoardController.php
+++ b/lib/Controller/BoardController.php
@@ -75,7 +75,7 @@ class BoardController extends Controller {
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
     public function read($boardId) {
-        return $this->boardService->find($this->userId, $boardId);
+        return $this->boardService->find($boardId);
     }
 
 	/**
@@ -98,7 +98,7 @@ class BoardController extends Controller {
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
     public function update($id, $title, $color) {
-        return $this->boardService->update($id, $title, $this->userId, $color);
+        return $this->boardService->update($id, $title, $color);
     }
 
 	/**
@@ -108,7 +108,7 @@ class BoardController extends Controller {
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
     public function delete($boardId) {
-        return $this->boardService->delete($this->userId, $boardId);
+        return $this->boardService->delete($boardId);
     }
 
 	/**
diff --git a/lib/Controller/CardController.php b/lib/Controller/CardController.php
index 2c979b3f9..f9641eb5a 100644
--- a/lib/Controller/CardController.php
+++ b/lib/Controller/CardController.php
@@ -47,7 +47,7 @@ class CardController extends Controller {
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
     public function read($cardId) {
-        return $this->cardService->find($this->userId, $cardId);
+        return $this->cardService->find($cardId);
     }
 
 	/**
@@ -108,7 +108,7 @@ class CardController extends Controller {
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
     public function delete($cardId) {
-        return $this->cardService->delete($this->userId, $cardId);
+        return $this->cardService->delete($cardId);
     }
 
 	/**
@@ -138,7 +138,7 @@ class CardController extends Controller {
 	 * @param $labelId
 	 */
     public function assignLabel($cardId, $labelId) {
-        return $this->cardService->assignLabel($this->userId, $cardId, $labelId);
+        return $this->cardService->assignLabel($cardId, $labelId);
     }
 
 	/**
@@ -148,7 +148,7 @@ class CardController extends Controller {
 	 * @param $labelId
 	 */
     public function removeLabel($cardId, $labelId) {
-        return $this->cardService->removeLabel($this->userId, $cardId, $labelId);
+        return $this->cardService->removeLabel($cardId, $labelId);
     }
 
 }
diff --git a/lib/Controller/LabelController.php b/lib/Controller/LabelController.php
index bf9367921..484324b1f 100644
--- a/lib/Controller/LabelController.php
+++ b/lib/Controller/LabelController.php
@@ -51,7 +51,7 @@ class LabelController extends Controller {
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
     public function create($title, $color, $boardId) {
-        return $this->labelService->create($title, $this->userId, $color, $boardId);
+        return $this->labelService->create($title, $color, $boardId);
     }
 
 	/**
@@ -63,7 +63,7 @@ class LabelController extends Controller {
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
     public function update($id, $title, $color) {
-        return $this->labelService->update($id, $title, $this->userId, $color);
+        return $this->labelService->update($id, $title, $color);
     }
 
 	/**
@@ -73,7 +73,7 @@ class LabelController extends Controller {
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
     public function delete($labelId) {
-        return $this->labelService->delete($this->userId, $labelId);
+        return $this->labelService->delete($labelId);
     }
 
 }
diff --git a/lib/Controller/StackController.php b/lib/Controller/StackController.php
index 486dd4d49..c629f7312 100644
--- a/lib/Controller/StackController.php
+++ b/lib/Controller/StackController.php
@@ -104,6 +104,6 @@ class StackController extends Controller {
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
     public function delete($stackId) {
-        return $this->stackService->delete($this->userId, $stackId);
+        return $this->stackService->delete($stackId);
     }
 }
diff --git a/lib/Db/BoardMapper.php b/lib/Db/BoardMapper.php
index 87b7bbd68..27af614b4 100644
--- a/lib/Db/BoardMapper.php
+++ b/lib/Db/BoardMapper.php
@@ -96,6 +96,7 @@ class BoardMapper extends DeckMapper implements IPermissionMapper {
         $sql = 'SELECT boards.id, title, owner, color, archived, 2 as shared FROM oc_deck_boards as boards ' .
             'INNER JOIN oc_deck_board_acl as acl ON boards.id=acl.board_id WHERE owner != ? AND type=\'group\' AND (';
         $countGroups = 0;
+		// FIXME: group unused?
         foreach ($groups as $group) {
             $sql .= 'acl.participant = ? ';
             if(count($groups)>1 && $countGroups++<count($groups)-1)
diff --git a/lib/Db/DeckMapper.php b/lib/Db/DeckMapper.php
index 919d46a89..6ad9ef749 100644
--- a/lib/Db/DeckMapper.php
+++ b/lib/Db/DeckMapper.php
@@ -50,6 +50,7 @@ abstract class DeckMapper extends Mapper {
 	}
 
 	protected function execute($sql, array $params = [], $limit = null, $offset = null) {
+		// FIXME: remove on release
 		\OCP\Util::writeLog('deck', "DeckMapper SQL: " . $sql, \OCP\Util::DEBUG);
 		return parent::execute($sql, $params, $limit, $offset);
 	}
diff --git a/lib/Db/LabelMapper.php b/lib/Db/LabelMapper.php
index d489e2c9b..9513e2822 100644
--- a/lib/Db/LabelMapper.php
+++ b/lib/Db/LabelMapper.php
@@ -68,14 +68,14 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
         return $result;
     }
 
-	public function deleteLabelAssignments($labelId, $limit=null, $offset=null) {
+	public function deleteLabelAssignments($labelId) {
 		$sql = 'DELETE FROM `*PREFIX*deck_assigned_labels` WHERE label_id = ?';
 		$stmt = $this->db->prepare($sql);
 		$stmt->bindParam(1, $labelId,  \PDO::PARAM_INT);
 		$stmt->execute();
 	}
 
-	public function deleteLabelAssignmentsForCard($cardId, $limit=null, $offset=null) {
+	public function deleteLabelAssignmentsForCard($cardId) {
 		$sql = 'DELETE FROM `*PREFIX*deck_assigned_labels` WHERE card_id = ?';
 		$stmt = $this->db->prepare($sql);
 		$stmt->bindParam(1, $cardId,  \PDO::PARAM_INT);
diff --git a/lib/Service/BoardService.php b/lib/Service/BoardService.php
index d3ce08081..ce1fb8643 100644
--- a/lib/Service/BoardService.php
+++ b/lib/Service/BoardService.php
@@ -61,7 +61,7 @@ class BoardService {
         return array_merge($userBoards, $groupBoards);
     }
 
-    public function find($userId, $boardId) {
+    public function find($boardId) {
         $board = $this->boardMapper->find($boardId);
         return $board;
     }
@@ -92,12 +92,12 @@ class BoardService {
 
     }
 
-    public function delete($userId, $id) {
-        return $this->boardMapper->delete($this->find($userId, $id));
+    public function delete($id) {
+        return $this->boardMapper->delete($this->find($id));
     }
 
-    public function update($id, $title, $userId, $color) {
-        $board = $this->find($userId, $id);
+    public function update($id, $title, $color) {
+        $board = $this->find($id);
         $board->setTitle($title);
         $board->setColor($color);
         return $this->boardMapper->update($board);
diff --git a/lib/Service/CardService.php b/lib/Service/CardService.php
index 40cbc06af..27dc81247 100644
--- a/lib/Service/CardService.php
+++ b/lib/Service/CardService.php
@@ -23,9 +23,6 @@
 
 namespace OCA\Deck\Service;
 
-
-
-
 use \OCA\Deck\Db\Card;
 use \OCA\Deck\Db\CardMapper;
 use \OCA\Deck\CardArchivedException;
@@ -35,12 +32,11 @@ class CardService  {
 
     private $cardMapper;
 
-
     public function __construct(CardMapper $cardMapper) {
         $this->cardMapper = $cardMapper;
     }
 
-    public function find($userId, $cardId) {
+    public function find($cardId) {
         return $this->cardMapper->find($cardId);
     }
     public function create($title, $stackId, $type, $order, $owner) {
@@ -54,7 +50,7 @@ class CardService  {
 
     }
 
-    public function delete($userId, $id) {
+    public function delete($id) {
         return $this->cardMapper->delete($this->cardMapper->find($id));
     }
 
@@ -117,7 +113,7 @@ class CardService  {
         return $this->cardMapper->update($card);
     }
 
-    public function assignLabel($userId, $cardId, $labelId) {
+    public function assignLabel($cardId, $labelId) {
         $card = $this->cardMapper->find($cardId);
         if($card->getArchived()) {
             throw new CardArchivedException();
@@ -125,7 +121,7 @@ class CardService  {
         $this->cardMapper->assignLabel($cardId, $labelId);
     }
 
-    public function removeLabel($userId, $cardId, $labelId) {
+    public function removeLabel($cardId, $labelId) {
         $card = $this->cardMapper->find($cardId);
         if($card->getArchived()) {
             throw new CardArchivedException();
diff --git a/lib/Service/LabelService.php b/lib/Service/LabelService.php
index 57507daeb..0a8e2d843 100644
--- a/lib/Service/LabelService.php
+++ b/lib/Service/LabelService.php
@@ -43,12 +43,12 @@ class LabelService  {
         $this->logger = $logger;
     }
 
-    public function find($userId, $labelId) {
+    public function find($labelId) {
         $label = $this->labelMapper->find($labelId);
         return $label;
     }
 
-    public function create($title, $userId, $color, $boardId) {
+    public function create($title, $color, $boardId) {
         $label = new Label();
         $label->setTitle($title);
         $label->setColor($color);
@@ -56,12 +56,12 @@ class LabelService  {
         return $this->labelMapper->insert($label);
     }
 
-    public function delete($userId, $id) {
-        return $this->labelMapper->delete($this->find($userId, $id));
+    public function delete($id) {
+        return $this->labelMapper->delete($this->find($id));
     }
 
-    public function update($id, $title, $userId, $color) {
-        $label = $this->find($userId, $id);
+    public function update($id, $title, $color) {
+        $label = $this->find($id);
         $label->setTitle($title);
         $label->setColor($color);
         return $this->labelMapper->update($label);
diff --git a/lib/Service/StackService.php b/lib/Service/StackService.php
index 63774646d..3fc21a27d 100644
--- a/lib/Service/StackService.php
+++ b/lib/Service/StackService.php
@@ -90,7 +90,7 @@ class StackService  {
 
     }
 
-    public function delete($userId, $id) {
+    public function delete($id) {
         return $this->stackMapper->delete($this->stackMapper->find($id));
     }