diff --git a/js/bower.json b/js/bower.json
index cd69efdc1..aae5fbcfd 100644
--- a/js/bower.json
+++ b/js/bower.json
@@ -10,7 +10,7 @@
     "angular-ui-bootstrap": "~1.*.*",
     "ng-sortable": "~1.*.*",
     "jquery": "~2.*",
-    "momentjs": "~2.11.*",
+    "momentjs": "~2.*",
     "es6-shim": "~0.*",
     "js-url": "~2.*",
     "masonry": "~4.0.0",
diff --git a/js/public/app.js b/js/public/app.js
index 45908bd3c..93a246820 100644
--- a/js/public/app.js
+++ b/js/public/app.js
@@ -119,7 +119,7 @@ app.controller('BoardController', ["$rootScope", "$scope", "$stateParams", "Stat
   $scope.sidebar = $rootScope.sidebar;
 
   $scope.id = $stateParams.boardId;
-  $scope.status={},
+  $scope.status={};
   $scope.newLabel={};
   $scope.status.boardtab = $stateParams.detailTab;
 
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index f74aa0422..5ba2a2c0a 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -29,6 +29,11 @@ use OCA\Deck\Middleware\SharingMiddleware;
 
 class Application extends App {
 
+	/**
+	 * Application constructor.
+	 *
+	 * @param array $urlParams
+	 */
 	public function __construct(array $urlParams = array()) {
 		parent::__construct('deck', $urlParams);
 
diff --git a/lib/Controller/BoardController.php b/lib/Controller/BoardController.php
index d126a7b9f..f0390bc82 100644
--- a/lib/Controller/BoardController.php
+++ b/lib/Controller/BoardController.php
@@ -26,9 +26,9 @@ namespace OCA\Deck\Controller;
 use OCA\Deck\Service\BoardService;
 
 use OCP\IRequest;
-use OCP\AppFramework\Http\DataResponse;
+
 use OCP\AppFramework\Controller;
-use OCP\AppFramework\Db\DoesNotExistException;
+
 use OCP\IUserManager;
 use OCP\IGroupManager;
 
@@ -37,6 +37,7 @@ class BoardController extends Controller {
     private $boardService;
     protected $userManager;
     protected $groupManager;
+	private $userInfo;
     public function __construct($appName,
                                 IRequest $request,
                                 IUserManager $userManager,
diff --git a/lib/Controller/LabelController.php b/lib/Controller/LabelController.php
index 2a8914f4d..1c0c76efe 100644
--- a/lib/Controller/LabelController.php
+++ b/lib/Controller/LabelController.php
@@ -26,9 +26,9 @@ namespace OCA\Deck\Controller;
 use OCA\Deck\Service\LabelService;
 
 use OCP\IRequest;
-use OCP\AppFramework\Http\DataResponse;
+
 use OCP\AppFramework\Controller;
-use OCP\AppFramework\Db\DoesNotExistException;
+
 
 class LabelController extends Controller {
     private $userId;
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index efaf7bf63..738daac31 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -25,7 +25,7 @@ namespace OCA\Deck\Controller;
 
 use OCP\IRequest;
 use OCP\AppFramework\Http\TemplateResponse;
-use OCP\AppFramework\Http\DataResponse;
+
 use OCP\AppFramework\Controller;
 use OCP\IL10N;
 
diff --git a/lib/Controller/StackController.php b/lib/Controller/StackController.php
index 49d061b99..1e5237ac8 100644
--- a/lib/Controller/StackController.php
+++ b/lib/Controller/StackController.php
@@ -26,9 +26,9 @@ namespace OCA\Deck\Controller;
 use OCA\Deck\Service\StackService;
 
 use OCP\IRequest;
-use OCP\AppFramework\Http\DataResponse;
+
 use OCP\AppFramework\Controller;
-use OCP\AppFramework\Db\DoesNotExistException;
+
 
 class StackController extends Controller {
     private $userId;
diff --git a/lib/Db/AclMapper.php b/lib/Db/AclMapper.php
index d08353561..79e0f8ea0 100644
--- a/lib/Db/AclMapper.php
+++ b/lib/Db/AclMapper.php
@@ -23,10 +23,9 @@
 
 namespace OCA\Deck\Db;
 
-use OCA\Deck\NoPermissionException;
-use OCP\AppFramework\Db\Entity;
+
+
 use OCP\IDb;
-use OCP\AppFramework\Db\Mapper;
 
 
 class AclMapper extends DeckMapper implements IPermissionMapper {
diff --git a/lib/Db/Board.php b/lib/Db/Board.php
index 309ca128d..ec7130ffe 100644
--- a/lib/Db/Board.php
+++ b/lib/Db/Board.php
@@ -21,7 +21,6 @@
  *  
  */
 
-// db/author.php
 namespace OCA\Deck\Db;
 
 use JsonSerializable;
diff --git a/lib/Db/BoardMapper.php b/lib/Db/BoardMapper.php
index 3499a1065..e0cb71e06 100644
--- a/lib/Db/BoardMapper.php
+++ b/lib/Db/BoardMapper.php
@@ -24,8 +24,6 @@
 namespace OCA\Deck\Db;
 
 use OCP\IDb;
-use OCP\AppFramework\Db\Mapper;
-use Symfony\Component\Config\Definition\Exception\Exception;
 
 
 class BoardMapper extends DeckMapper implements IPermissionMapper {
diff --git a/lib/Service/BoardService.php b/lib/Service/BoardService.php
index f75abce96..8bbaa14e1 100644
--- a/lib/Service/BoardService.php
+++ b/lib/Service/BoardService.php
@@ -28,7 +28,7 @@ use OCA\Deck\Db\AclMapper;
 use OCA\Deck\Db\Label;
 use OCP\ILogger;
 use OCP\IL10N;
-use OCP\AppFramework\Db\DoesNotExistException;
+
 use OCP\AppFramework\Utility\ITimeFactory;
 
 use \OCA\Deck\Db\Board;
@@ -43,12 +43,10 @@ class BoardService {
     private $labelMapper;
     private $logger;
     private $l10n;
-    private $timeFactory;
 
     public function __construct(BoardMapper $boardMapper,
                                 ILogger $logger,
                                 IL10N $l10n,
-                                ITimeFactory $timeFactory,
                                 LabelMapper $labelMapper,
                                 AclMapper $aclMapper) {
         $this->boardMapper = $boardMapper;
diff --git a/lib/Service/CardService.php b/lib/Service/CardService.php
index 680262b45..7d6a02f16 100644
--- a/lib/Service/CardService.php
+++ b/lib/Service/CardService.php
@@ -23,11 +23,8 @@
 
 namespace OCA\Deck\Service;
 
-use OC\OCS\Exception;
-use OCP\ILogger;
-use OCP\IL10N;
-use OCP\AppFramework\Db\DoesNotExistException;
-use OCP\AppFramework\Utility\ITimeFactory;
+
+
 
 use \OCA\Deck\Db\Card;
 use \OCA\Deck\Db\CardMapper;
@@ -36,7 +33,6 @@ use \OCA\Deck\Db\CardMapper;
 class CardService  {
 
     private $cardMapper;
-    private $logger;
 
 
     public function __construct(CardMapper $cardMapper) {
diff --git a/lib/Service/LabelService.php b/lib/Service/LabelService.php
index 7f0bfc531..fb1ac145e 100644
--- a/lib/Service/LabelService.php
+++ b/lib/Service/LabelService.php
@@ -26,11 +26,10 @@ namespace OCA\Deck\Service;
 use OCA\Deck\Db\Label;
 use OCP\ILogger;
 use OCP\IL10N;
-use OCP\AppFramework\Db\DoesNotExistException;
+
 use OCP\AppFramework\Utility\ITimeFactory;
 
-use \OCA\Deck\Db\Board;
-use \OCA\Deck\Db\BoardMapper;
+
 use \OCA\Deck\Db\LabelMapper;
 
 
@@ -38,12 +37,9 @@ class LabelService  {
 
     private $labelMapper;
     private $logger;
-    private $l10n;
-    private $timeFactory;
 
     public function __construct(ILogger $logger,
                                 IL10N $l10n,
-                                ITimeFactory $timeFactory,
                                 LabelMapper $labelMapper) {
         $this->labelMapper = $labelMapper;
         $this->logger = $logger;
diff --git a/lib/Service/StackService.php b/lib/Service/StackService.php
index c9f05e601..ab8a0cfc9 100644
--- a/lib/Service/StackService.php
+++ b/lib/Service/StackService.php
@@ -27,7 +27,7 @@ use OCA\Deck\Db\CardMapper;
 use OCA\Deck\Db\LabelMapper;
 use OCP\ILogger;
 use OCP\IL10N;
-use OCP\AppFramework\Db\DoesNotExistException;
+
 use OCP\AppFramework\Utility\ITimeFactory;
 
 use \OCA\Deck\Db\Stack;
@@ -40,8 +40,6 @@ class StackService  {
     private $stackMapper;
     private $cardMapper;
     private $logger;
-    private $l10n;
-    private $timeFactory;
     private $labelMapper;
 
     public function __construct(StackMapper $stackMapper, CardMapper $cardMapper, LabelMapper $labelMapper, ILogger $logger,