diff --git a/app/assets/javascripts/angular/controllers/dialogs/columns.js b/app/assets/javascripts/angular/controllers/dialogs/columns.js
index 9b8c405da0..3636fcdb4f 100644
--- a/app/assets/javascripts/angular/controllers/dialogs/columns.js
+++ b/app/assets/javascripts/angular/controllers/dialogs/columns.js
@@ -37,14 +37,13 @@ angular.module('openproject.workPackages.controllers')
 }])
 
 .controller('ColumnsModalController', ['$scope',
-  '$timeout',
   '$filter',
   'columnsModal',
   'QueryService',
   'WorkPackageService',
   'WorkPackagesTableService',
   '$rootScope',
-  function($scope, $timeout, $filter, columnsModal, QueryService, WorkPackageService, WorkPackagesTableService, $rootScope) {
+  function($scope, $filter, columnsModal, QueryService, WorkPackageService, WorkPackagesTableService, $rootScope) {
 
   this.name    = 'Columns';
   this.closeMe = columnsModal.deactivate;
diff --git a/app/assets/javascripts/angular/controllers/dialogs/export.js b/app/assets/javascripts/angular/controllers/dialogs/export.js
index 77c8765554..a6d978421b 100644
--- a/app/assets/javascripts/angular/controllers/dialogs/export.js
+++ b/app/assets/javascripts/angular/controllers/dialogs/export.js
@@ -36,8 +36,8 @@ angular.module('openproject.workPackages.controllers')
   });
 }])
 
-.controller('ExportModalController', ['$scope', 'exportModal', 'QueryService', 'UrlParamsHelper',
-	function($scope, exportModal, QueryService, UrlParamsHelper) {
+.controller('ExportModalController', ['exportModal', 'QueryService', 'UrlParamsHelper',
+	function(exportModal, QueryService, UrlParamsHelper) {
   this.name    = 'Export';
   var query = QueryService.getQuery();
   this.closeMe = exportModal.deactivate;
diff --git a/app/assets/javascripts/angular/controllers/dialogs/share.js b/app/assets/javascripts/angular/controllers/dialogs/share.js
index 11d5fb81c1..2035c8320d 100644
--- a/app/assets/javascripts/angular/controllers/dialogs/share.js
+++ b/app/assets/javascripts/angular/controllers/dialogs/share.js
@@ -38,7 +38,6 @@ angular.module('openproject.workPackages.controllers')
 
 .controller('ShareModalController', [
   '$scope',
-  'I18n',
   'shareModal',
   'QueryService',
   'AuthorisationService',
@@ -46,7 +45,7 @@ angular.module('openproject.workPackages.controllers')
   'QUERY_MENU_ITEM_TYPE',
   'queryMenuItemFactory',
   'PathHelper',
-  function($scope, I18n, shareModal, QueryService, AuthorisationService, $rootScope, QUERY_MENU_ITEM_TYPE, queryMenuItemFactory, PathHelper) {
+  function($scope, shareModal, QueryService, AuthorisationService, $rootScope, QUERY_MENU_ITEM_TYPE, queryMenuItemFactory, PathHelper) {
 
   this.name    = 'Share';
   this.closeMe = shareModal.deactivate;
diff --git a/app/assets/javascripts/angular/controllers/timelines-controller.js b/app/assets/javascripts/angular/controllers/timelines-controller.js
index 0e9af3bb27..c5aaa8a8ac 100644
--- a/app/assets/javascripts/angular/controllers/timelines-controller.js
+++ b/app/assets/javascripts/angular/controllers/timelines-controller.js
@@ -28,7 +28,7 @@
 
 angular.module('openproject.timelines.controllers')
 
-.controller('TimelinesController', ['$scope', 'Timeline', function($scope, Timeline) {
+.controller('TimelinesController', ['$scope', function($scope) {
   // Setup
 
   // Get server-side stuff into scope
diff --git a/app/assets/javascripts/angular/directives/components/date-directive.js b/app/assets/javascripts/angular/directives/components/date-directive.js
index 1c7877af5e..f355afe227 100644
--- a/app/assets/javascripts/angular/directives/components/date-directive.js
+++ b/app/assets/javascripts/angular/directives/components/date-directive.js
@@ -29,7 +29,7 @@
 // TODO move to UI components
 angular.module('openproject.uiComponents')
 
-.directive('date', ['I18n', 'TimezoneService', 'ConfigurationService', function(I18n, TimezoneService, ConfigurationService) {
+.directive('date', ['TimezoneService', function(TimezoneService) {
   return {
     restrict: 'EA',
     replace: true,
@@ -44,7 +44,7 @@ angular.module('openproject.uiComponents')
   };
 }])
 
-.directive('time', ['I18n', 'TimezoneService', 'ConfigurationService', function(I18n, TimezoneService, ConfigurationService) {
+.directive('time', ['TimezoneService', function(TimezoneService) {
   return {
     restrict: 'EA',
     replace: true,
diff --git a/app/assets/javascripts/angular/directives/components/focus.js b/app/assets/javascripts/angular/directives/components/focus.js
index 9846727dc7..e584745846 100644
--- a/app/assets/javascripts/angular/directives/components/focus.js
+++ b/app/assets/javascripts/angular/directives/components/focus.js
@@ -29,7 +29,7 @@
 // TODO move to UI components
 angular.module('openproject.uiComponents')
 
-.directive('focus', ['$timeout', 'FocusHelper', function($timeout, FocusHelper) {
+.directive('focus', ['FocusHelper', function(FocusHelper) {
 
   function isSelect2Element(attrs) {
     var select2attributes = Object.keys(attrs).filter(function(attribute) {
diff --git a/app/assets/javascripts/angular/directives/components/toggled-multiselect-directive.js b/app/assets/javascripts/angular/directives/components/toggled-multiselect-directive.js
index ef7b148ecb..50da0ab5b6 100644
--- a/app/assets/javascripts/angular/directives/components/toggled-multiselect-directive.js
+++ b/app/assets/javascripts/angular/directives/components/toggled-multiselect-directive.js
@@ -29,7 +29,7 @@
 // TODO move to UI components
 angular.module('openproject.uiComponents')
 
-.directive('toggledMultiselect', ['WorkPackagesHelper', 'I18n', function(WorkPackagesHelper, I18n){
+.directive('toggledMultiselect', ['I18n', function(I18n){
   return {
     restrict: 'EA',
     replace: true,
diff --git a/app/assets/javascripts/angular/services/query-service.js b/app/assets/javascripts/angular/services/query-service.js
index e946390433..2141552984 100644
--- a/app/assets/javascripts/angular/services/query-service.js
+++ b/app/assets/javascripts/angular/services/query-service.js
@@ -32,7 +32,6 @@ angular.module('openproject.services')
   'Query',
   'Sortation',
   '$http',
-  '$location',
   'PathHelper',
   '$q',
   'AVAILABLE_WORK_PACKAGE_FILTERS',
@@ -46,7 +45,7 @@ angular.module('openproject.services')
   'ProjectService',
   'WorkPackagesTableHelper',
   'I18n',
-  function(Query, Sortation, $http, $location, PathHelper, $q, AVAILABLE_WORK_PACKAGE_FILTERS, StatusService, TypeService, PriorityService, UserService, VersionService, RoleService, GroupService, ProjectService, WorkPackagesTableHelper, I18n) {
+  function(Query, Sortation, $http, PathHelper, $q, AVAILABLE_WORK_PACKAGE_FILTERS, StatusService, TypeService, PriorityService, UserService, VersionService, RoleService, GroupService, ProjectService, WorkPackagesTableHelper, I18n) {
 
   var query;
 
diff --git a/app/assets/javascripts/angular/work_packages/controllers/details-tab-watchers-controller.js b/app/assets/javascripts/angular/work_packages/controllers/details-tab-watchers-controller.js
index ffbbd004bb..982b92990f 100644
--- a/app/assets/javascripts/angular/work_packages/controllers/details-tab-watchers-controller.js
+++ b/app/assets/javascripts/angular/work_packages/controllers/details-tab-watchers-controller.js
@@ -34,10 +34,9 @@ angular.module('openproject.workPackages.controllers')
             ['$scope',
              '$filter',
              '$timeout',
-             'workPackage',
              'I18n',
              'ADD_WATCHER_SELECT_INDEX',
-             function($scope, $filter, $timeout, workPackage, I18n, ADD_WATCHER_SELECT_INDEX) {
+             function($scope, $filter, $timeout, I18n, ADD_WATCHER_SELECT_INDEX) {
   $scope.I18n = I18n;
   $scope.focusElementIndex;
 
diff --git a/app/assets/javascripts/angular/work_packages/controllers/work-packages-controller.js b/app/assets/javascripts/angular/work_packages/controllers/work-packages-controller.js
index c32228482f..3707f7c90d 100644
--- a/app/assets/javascripts/angular/work_packages/controllers/work-packages-controller.js
+++ b/app/assets/javascripts/angular/work_packages/controllers/work-packages-controller.js
@@ -33,8 +33,7 @@ angular.module('openproject.workPackages.controllers')
     '$state',
     '$stateParams',
     'QueryService',
-    'ProjectService',
-    function($scope, $state, $stateParams, QueryService, ProjectService) {
+    function($scope, $state, $stateParams, QueryService) {
 
   // Setup
   $scope.$state = $state;
diff --git a/app/assets/javascripts/angular/work_packages/directives/query-filter-directive.js b/app/assets/javascripts/angular/work_packages/directives/query-filter-directive.js
index 2feb8abc11..bd5c645a22 100644
--- a/app/assets/javascripts/angular/work_packages/directives/query-filter-directive.js
+++ b/app/assets/javascripts/angular/work_packages/directives/query-filter-directive.js
@@ -28,7 +28,13 @@
 
 angular.module('openproject.workPackages.directives')
 
-.directive('queryFilter', ['WorkPackagesTableHelper', 'WorkPackageService', 'WorkPackageLoadingHelper', 'QueryService', 'PaginationService', 'I18n', '$timeout', function(WorkPackagesTableHelper, WorkPackageService, WorkPackageLoadingHelper, QueryService, PaginationService, I18n, $timeout) {
+.directive('queryFilter', [
+    'WorkPackageLoadingHelper',
+    'QueryService',
+    'PaginationService',
+    'I18n',
+    '$timeout',
+    function(WorkPackageLoadingHelper, QueryService, PaginationService, I18n, $timeout) {
 
   var updateResultsJob;
 
diff --git a/app/assets/javascripts/angular/work_packages/directives/query-filters-directive.js b/app/assets/javascripts/angular/work_packages/directives/query-filters-directive.js
index 1c0b66189b..7c5aacb75f 100644
--- a/app/assets/javascripts/angular/work_packages/directives/query-filters-directive.js
+++ b/app/assets/javascripts/angular/work_packages/directives/query-filters-directive.js
@@ -28,7 +28,7 @@
 
 angular.module('openproject.workPackages.directives')
 
-.directive('queryFilters', ['WorkPackagesTableHelper', 'FiltersHelper', 'WorkPackageService', 'I18n', function(WorkPackagesTableHelper, FiltersHelper, WorkPackageService, I18n) {
+.directive('queryFilters', ['FiltersHelper', 'I18n', function(FiltersHelper, I18n) {
 
   return {
     restrict: 'E',
diff --git a/app/assets/javascripts/angular/work_packages/directives/query-form-directive.js b/app/assets/javascripts/angular/work_packages/directives/query-form-directive.js
index 7e6af7f31d..7c9c272a88 100644
--- a/app/assets/javascripts/angular/work_packages/directives/query-form-directive.js
+++ b/app/assets/javascripts/angular/work_packages/directives/query-form-directive.js
@@ -28,7 +28,7 @@
 
 angular.module('openproject.workPackages.directives')
 
-.directive('queryForm', ['WorkPackagesTableHelper', 'WorkPackageService', function(WorkPackagesTableHelper, WorkPackageService) {
+.directive('queryForm', [function() {
 
   return {
     restrict: 'EA',
diff --git a/app/assets/javascripts/angular/work_packages/directives/work-package-details-toolbar-directive.js b/app/assets/javascripts/angular/work_packages/directives/work-package-details-toolbar-directive.js
index d3eaa23404..a0c1e72d3c 100644
--- a/app/assets/javascripts/angular/work_packages/directives/work-package-details-toolbar-directive.js
+++ b/app/assets/javascripts/angular/work_packages/directives/work-package-details-toolbar-directive.js
@@ -36,7 +36,6 @@ angular.module('openproject.workPackages.directives')
   '$window',
   'I18n',
   'HookService',
-  'WorkPackagesTableService',
   'WorkPackageService',
   'WorkPackageAuthorization',
   'PathHelper',
@@ -45,7 +44,6 @@ angular.module('openproject.workPackages.directives')
            $window,
            I18n,
            HookService,
-           WorkPackagesTableService,
            WorkPackageService,
            WorkPackageAuthorization,
            PathHelper) {
diff --git a/app/assets/javascripts/angular/work_packages/directives/work-package-group-sums-directive.js b/app/assets/javascripts/angular/work_packages/directives/work-package-group-sums-directive.js
index f3cafcac11..9fd4e3ab10 100644
--- a/app/assets/javascripts/angular/work_packages/directives/work-package-group-sums-directive.js
+++ b/app/assets/javascripts/angular/work_packages/directives/work-package-group-sums-directive.js
@@ -28,7 +28,7 @@
 
 angular.module('openproject.workPackages.directives')
 
-.directive('workPackageGroupSums', ['WorkPackagesHelper', 'WorkPackageService', function(WorkPackagesHelper, WorkPackageService) {
+.directive('workPackageGroupSums', [function() {
 
   return {
     restrict: 'A',
diff --git a/app/assets/javascripts/angular/work_packages/tabs/attachments-table-directive.js b/app/assets/javascripts/angular/work_packages/tabs/attachments-table-directive.js
index 7cd7be03c4..5f31d4180b 100644
--- a/app/assets/javascripts/angular/work_packages/tabs/attachments-table-directive.js
+++ b/app/assets/javascripts/angular/work_packages/tabs/attachments-table-directive.js
@@ -28,7 +28,7 @@
 
 angular.module('openproject.workPackages.directives')
 
-.directive('attachmentsTable', ['PathHelper', 'I18n', function(PathHelper, I18n){
+.directive('attachmentsTable', ['I18n', function(I18n){
   return {
     restrict: 'E',
     templateUrl: '/templates/work_packages/tabs/_attachments_table.html',
diff --git a/app/assets/javascripts/angular/work_packages/tabs/related-work-package-table-row-directive.js b/app/assets/javascripts/angular/work_packages/tabs/related-work-package-table-row-directive.js
index 7882431fba..79b2cb3ff5 100644
--- a/app/assets/javascripts/angular/work_packages/tabs/related-work-package-table-row-directive.js
+++ b/app/assets/javascripts/angular/work_packages/tabs/related-work-package-table-row-directive.js
@@ -33,9 +33,7 @@ angular.module('openproject.workPackages.tabs')
     'I18n',
     'PathHelper',
     'WorkPackagesHelper',
-    'ApiHelper',
-    'WorkPackageService',
-    function(I18n, PathHelper, WorkPackagesHelper, ApiHelper, WorkPackageService) {
+    function(I18n, PathHelper, WorkPackagesHelper) {
   return {
     restrict: 'A',
     link: function(scope) {
diff --git a/app/assets/javascripts/angular/work_packages/tabs/work-package-relations-directive.js b/app/assets/javascripts/angular/work_packages/tabs/work-package-relations-directive.js
index 7c1f50ebe2..7051782d6c 100644
--- a/app/assets/javascripts/angular/work_packages/tabs/work-package-relations-directive.js
+++ b/app/assets/javascripts/angular/work_packages/tabs/work-package-relations-directive.js
@@ -31,13 +31,9 @@ angular.module('openproject.workPackages.tabs')
 
 .directive('workPackageRelations', [
     'I18n',
-    'PathHelper',
-    'WorkPackageService',
     'WorkPackagesHelper',
-    'PathHelper',
-    'ApiHelper',
     '$timeout',
-    function(I18n, PathHelper, WorkPackageService, WorkPackagesHelper, PathHelper, ApiHelper, $timeout) {
+    function(I18n, WorkPackagesHelper, $timeout) {
   return {
     restrict: 'E',
     replace: true,
diff --git a/app/assets/javascripts/angular/work_packages/work-package-context-menu.js b/app/assets/javascripts/angular/work_packages/work-package-context-menu.js
index 8f8a4a3065..37ac8c1f62 100644
--- a/app/assets/javascripts/angular/work_packages/work-package-context-menu.js
+++ b/app/assets/javascripts/angular/work_packages/work-package-context-menu.js
@@ -43,7 +43,6 @@ angular.module('openproject.workPackages')
 
 .controller('WorkPackageContextMenuController', [
   '$scope',
-  '$rootScope',
   'WorkPackagesTableHelper',
   'WorkPackageContextMenuHelper',
   'WorkPackageService',
@@ -51,7 +50,7 @@ angular.module('openproject.workPackages')
   'I18n',
   '$window',
   'PERMITTED_CONTEXT_MENU_ACTIONS',
-  function($scope, $rootScope, WorkPackagesTableHelper, WorkPackageContextMenuHelper, WorkPackageService, WorkPackagesTableService, I18n, $window, PERMITTED_CONTEXT_MENU_ACTIONS) {
+  function($scope, WorkPackagesTableHelper, WorkPackageContextMenuHelper, WorkPackageService, WorkPackagesTableService, I18n, $window, PERMITTED_CONTEXT_MENU_ACTIONS) {
 
   $scope.I18n = I18n;