Removed unnecessary dependency injections

2026-01-15 03:40:42 -03:30 · 2017-03-16 14:53:08 -04:00 · 2017-03-16 14:53:08 -04:00 · 1869ba6742
commit 1869ba6742
parent 1c266b6ab5
85 changed files with 272 additions and 306 deletions
--- a/awx/ui/client/src/access/add-rbac-resource/rbac-resource.directive.js
+++ b/awx/ui/client/src/access/add-rbac-resource/rbac-resource.directive.js
@ -7,8 +7,8 @@ import controller from './rbac-resource.controller';

 /* jshint unused: vars */
 export default ['templateUrl', '$state',
-    'Wait', 'addPermissionsUsersList', 'addPermissionsTeamsList',
-    function(templateUrl, $state, Wait, usersList, teamsList) {
+    'addPermissionsUsersList', 'addPermissionsTeamsList',
+    function(templateUrl, $state, usersList, teamsList) {
        return {
            restrict: 'E',
            scope: {
--- a/awx/ui/client/src/access/add-rbac-user-team/rbac-selected-list.directive.js
+++ b/awx/ui/client/src/access/add-rbac-user-team/rbac-selected-list.directive.js
@ -5,10 +5,10 @@
 *************************************************/

 /* jshint unused: vars */
-export default ['$compile','templateUrl', 'i18n', 'generateList',
+export default ['$compile', 'i18n', 'generateList',
    'ProjectList', 'TemplateList', 'InventoryList', 'CredentialList',
    'OrganizationList',
-    function($compile, templateUrl, i18n, generateList,
+    function($compile, i18n, generateList,
    ProjectList, TemplateList, InventoryList, CredentialList,
    OrganizationList) {
        return {
--- a/awx/ui/client/src/access/add-rbac-user-team/rbac-user-team.controller.js
+++ b/awx/ui/client/src/access/add-rbac-user-team/rbac-user-team.controller.js
@ -11,8 +11,8 @@
 * Controller for handling permissions adding
 */

-export default ['$rootScope', '$scope', '$state', 'i18n', 'CreateSelect2', 'GetBasePath', 'Rest', '$q', 'Wait', 'ProcessErrors',
-function(rootScope, scope, $state, i18n, CreateSelect2, GetBasePath, Rest, $q, Wait, ProcessErrors) {
+export default ['$scope', '$state', 'i18n', 'CreateSelect2', 'Rest', '$q', 'Wait', 'ProcessErrors',
+function(scope, $state, i18n, CreateSelect2, Rest, $q, Wait, ProcessErrors) {

    init();

--- a/awx/ui/client/src/access/rbac-multiselect/rbac-multiselect-list.directive.js
+++ b/awx/ui/client/src/access/rbac-multiselect/rbac-multiselect-list.directive.js
@ -6,10 +6,10 @@

 /* jshint unused: vars */
 export default ['addPermissionsTeamsList', 'addPermissionsUsersList', 'TemplateList', 'ProjectList',
-    'InventoryList', 'CredentialList', '$compile', 'generateList', 'GetBasePath',
+    'InventoryList', 'CredentialList', '$compile', 'generateList',
    'OrganizationList',
    function(addPermissionsTeamsList, addPermissionsUsersList, TemplateList, ProjectList,
-    InventoryList, CredentialList, $compile, generateList, GetBasePath,
+    InventoryList, CredentialList, $compile, generateList,
    OrganizationList) {
    return {
        restrict: 'E',
--- a/awx/ui/client/src/activity-stream/factories/show-detail.factory.js
+++ b/awx/ui/client/src/activity-stream/factories/show-detail.factory.js
@ -1,5 +1,5 @@
 export default
-     function ShowDetail($filter, $rootScope, Rest, Alert, GenerateForm, ProcessErrors, GetBasePath, FormatDate, ActivityDetailForm, Empty, Find) {
+     function ShowDetail($filter, Find) {
         return function (params, scope) {

             var activity_id = params.activity_id,
@ -35,5 +35,4 @@ export default
         };
     }

- ShowDetail.$inject = ['$filter', '$rootScope', 'Rest', 'Alert', 'GenerateForm', 'ProcessErrors', 'GetBasePath', 'FormatDate',
-     'ActivityDetailForm', 'Empty', 'Find'];
+ ShowDetail.$inject = ['$filter', 'Find'];
--- a/awx/ui/client/src/activity-stream/factories/stream.factory.js
+++ b/awx/ui/client/src/activity-stream/factories/stream.factory.js
@ -1,7 +1,5 @@
 export default
-     function Stream($rootScope, $location, $state, Rest, GetBasePath, ProcessErrors,
-         Wait, StreamList, GenerateList, FormatDate,
-         BuildDescription, ShowDetail) {
+     function Stream($rootScope, $state, BuildDescription, ShowDetail) {
         return function (params) {

             var scope = params.scope;
@ -49,6 +47,4 @@ export default
         };
     }

- Stream.$inject = ['$rootScope', '$location', '$state', 'Rest', 'GetBasePath',
-     'ProcessErrors', 'Wait', 'StreamList', 'generateList', 'FormatDate', 'BuildDescription',
-     'ShowDetail'];
+ Stream.$inject = ['$rootScope', '$state', 'BuildDescription', 'ShowDetail'];
--- a/awx/ui/client/src/bread-crumb/bread-crumb.directive.js
+++ b/awx/ui/client/src/bread-crumb/bread-crumb.directive.js
@ -1,6 +1,6 @@
 export default
-    ['templateUrl', '$state', 'FeaturesService', 'ProcessErrors','$rootScope', 'Store', 'Empty', '$window', 'BreadCrumbService', 'i18n',
-    function(templateUrl, $state, FeaturesService, ProcessErrors, $rootScope, Store, Empty, $window, BreadCrumbService, i18n) {
+    ['templateUrl', '$state', 'FeaturesService','$rootScope', 'Store', 'Empty', '$window', 'BreadCrumbService', 'i18n',
+    function(templateUrl, $state, FeaturesService, $rootScope, Store, Empty, $window, BreadCrumbService, i18n) {
        return {
            restrict: 'E',
            templateUrl: templateUrl('bread-crumb/bread-crumb'),
--- a/awx/ui/client/src/credentials/add/credentials-add.controller.js
+++ b/awx/ui/client/src/credentials/add/credentials-add.controller.js
@ -4,12 +4,12 @@
 * All Rights Reserved
 *************************************************/

-export default ['$scope', '$rootScope', '$compile', '$location',
-    '$log', '$stateParams', 'CredentialForm', 'GenerateForm', 'Rest', 'Alert',
+export default ['$scope', '$rootScope',
+    '$log', '$stateParams', 'CredentialForm', 'GenerateForm', 'Rest',
    'ProcessErrors', 'ClearScope', 'GetBasePath', 'GetChoices', 'Empty', 'KindChange', 'BecomeMethodChange',
    'OwnerChange', 'CredentialFormSave', '$state', 'CreateSelect2', 'i18n',
-    function($scope, $rootScope, $compile, $location, $log,
-    $stateParams, CredentialForm, GenerateForm, Rest, Alert, ProcessErrors,
+    function($scope, $rootScope, $log,
+    $stateParams, CredentialForm, GenerateForm, Rest, ProcessErrors,
    ClearScope, GetBasePath, GetChoices, Empty, KindChange, BecomeMethodChange,
    OwnerChange, CredentialFormSave, $state, CreateSelect2, i18n) {

--- a/awx/ui/client/src/credentials/edit/credentials-edit.controller.js
+++ b/awx/ui/client/src/credentials/edit/credentials-edit.controller.js
@ -4,13 +4,13 @@
 * All Rights Reserved
 *************************************************/

-export default ['$scope', '$rootScope', '$compile', '$location',
-    '$log', '$stateParams', 'CredentialForm', 'Rest', 'Alert',
+export default ['$scope', '$rootScope', '$location',
+    '$stateParams', 'CredentialForm', 'Rest',
    'ProcessErrors', 'ClearScope', 'Prompt', 'GetBasePath', 'GetChoices',
    'KindChange', 'BecomeMethodChange', 'Empty', 'OwnerChange',
    'CredentialFormSave', 'Wait', '$state', 'CreateSelect2', 'Authorization', 'i18n',
-    function($scope, $rootScope, $compile, $location, $log,
-    $stateParams, CredentialForm, Rest, Alert, ProcessErrors, ClearScope, Prompt,
+    function($scope, $rootScope, $location,
+    $stateParams, CredentialForm, Rest, ProcessErrors, ClearScope, Prompt,
    GetBasePath, GetChoices, KindChange, BecomeMethodChange, Empty, OwnerChange, CredentialFormSave, Wait,
    $state, CreateSelect2, Authorization, i18n) {

--- a/awx/ui/client/src/credentials/factories/credential-form-save.factory.js
+++ b/awx/ui/client/src/credentials/factories/credential-form-save.factory.js
@ -1,5 +1,5 @@
 export default
-    function CredentialFormSave($rootScope, $location, Alert, Rest, ProcessErrors, Empty, GetBasePath, CredentialForm, ReturnToCaller, Wait, $state, i18n) {
+    function CredentialFormSave($rootScope, $location, Rest, ProcessErrors, GetBasePath, CredentialForm, ReturnToCaller, Wait, $state, i18n) {
        return function(params) {
            var scope = params.scope,
            mode = params.mode,
@ -99,7 +99,7 @@ export default
    }

 CredentialFormSave.$inject =
-    [   '$rootScope', '$location', 'Alert', 'Rest',
-        'ProcessErrors', 'Empty', 'GetBasePath', 'CredentialForm',
+    [   '$rootScope', '$location', 'Rest',
+        'ProcessErrors', 'GetBasePath', 'CredentialForm',
        'ReturnToCaller', 'Wait', '$state', 'i18n'
    ];
--- a/awx/ui/client/src/credentials/list/credentials-list.controller.js
+++ b/awx/ui/client/src/credentials/list/credentials-list.controller.js
@ -4,11 +4,9 @@
 * All Rights Reserved
 *************************************************/

-export default ['$scope', '$rootScope', '$location', '$log',
-    '$stateParams', 'Rest', 'Alert', 'CredentialList', 'Prompt', 'ClearScope',
+export default ['$scope', 'Rest', 'CredentialList', 'Prompt', 'ClearScope',
    'ProcessErrors', 'GetBasePath', 'Wait', '$state', '$filter', 'rbacUiControlService', 'Dataset', 'i18n',
-    function($scope, $rootScope, $location, $log,
-    $stateParams, Rest, Alert, CredentialList, Prompt, ClearScope,
+    function($scope, Rest, CredentialList, Prompt, ClearScope,
    ProcessErrors, GetBasePath, Wait, $state, $filter, rbacUiControlService, Dataset,
    i18n) {

--- a/awx/ui/client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js
+++ b/awx/ui/client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js
@ -5,19 +5,15 @@
 *************************************************/

 export default
-    [   '$rootScope',
-        '$compile',
-        '$location' ,
-        '$window',
-        'Wait',
+    [   '$window',
        'adjustGraphSize',
-        'jobStatusGraphData',
        'templateUrl',
        'i18n',
+        'jobStatusGraphData',
        JobStatusGraph
    ];

-function JobStatusGraph($rootScope, $compile , $location, $window, Wait, adjustGraphSize, graphDataService, templateUrl, i18n) {
+function JobStatusGraph($window, adjustGraphSize, templateUrl, i18n, graphDataService) {
            return {
                restrict: 'E',
                scope: {
--- a/awx/ui/client/src/home/home.controller.js
+++ b/awx/ui/client/src/home/home.controller.js
@ -4,10 +4,10 @@
 * All Rights Reserved
 *************************************************/

-export default ['$scope', '$compile', '$stateParams', '$rootScope', '$location', '$log','Wait',
-    'ClearScope', 'Rest', 'GetBasePath', 'ProcessErrors', '$window', 'graphData',
-    function($scope, $compile, $stateParams, $rootScope, $location, $log, Wait,
-    ClearScope, Rest, GetBasePath, ProcessErrors, $window, graphData) {
+export default ['$scope', '$rootScope','Wait',
+    'ClearScope', 'Rest', 'GetBasePath', 'ProcessErrors', 'graphData',
+    function($scope, $rootScope, Wait,
+    ClearScope, Rest, GetBasePath, ProcessErrors, graphData) {

        ClearScope('home');

--- a/awx/ui/client/src/inventories/add/inventory-add.controller.js
+++ b/awx/ui/client/src/inventories/add/inventory-add.controller.js
@ -10,8 +10,8 @@
 * @description This controller's for the Inventory page
 */

-function InventoriesAdd($scope, $rootScope, $compile, $location, $log,
-    $stateParams, GenerateForm, InventoryForm, rbacUiControlService, Rest, Alert, ProcessErrors,
+function InventoriesAdd($scope, $location,
+    GenerateForm, InventoryForm, rbacUiControlService, Rest, Alert, ProcessErrors,
    ClearScope, GetBasePath, ParseTypeChange, Wait, ToJSON,
    $state) {

@ -96,8 +96,8 @@ function InventoriesAdd($scope, $rootScope, $compile, $location, $log,
    };
 }

-export default ['$scope', '$rootScope', '$compile', '$location',
-    '$log', '$stateParams', 'GenerateForm', 'InventoryForm', 'rbacUiControlService', 'Rest', 'Alert',
+export default ['$scope', '$location',
+    'GenerateForm', 'InventoryForm', 'rbacUiControlService', 'Rest', 'Alert',
    'ProcessErrors', 'ClearScope', 'GetBasePath', 'ParseTypeChange',
    'Wait', 'ToJSON', '$state', InventoriesAdd
 ];
--- a/awx/ui/client/src/inventories/edit/inventory-edit.controller.js
+++ b/awx/ui/client/src/inventories/edit/inventory-edit.controller.js
@ -10,11 +10,10 @@
 * @description This controller's for the Inventory page
 */

-function InventoriesEdit($scope, $rootScope, $compile, $location,
-    $log, $stateParams, InventoryForm, Rest, Alert, ProcessErrors,
+function InventoriesEdit($scope, $location,
+    $stateParams, InventoryForm, Rest, ProcessErrors,
    ClearScope, GetBasePath, ParseTypeChange, Wait, ToJSON,
-    ParseVariableString, Prompt, InitiatePlaybookRun,
-    TemplatesService, $state) {
+    ParseVariableString, $state) {

    // Inject dynamic view
    var defaultUrl = GetBasePath('inventory'),
@ -128,9 +127,9 @@ function InventoriesEdit($scope, $rootScope, $compile, $location,

 }

-export default ['$scope', '$rootScope', '$compile', '$location',
-    '$log', '$stateParams', 'InventoryForm', 'Rest', 'Alert',
+export default ['$scope', '$location',
+    '$stateParams', 'InventoryForm', 'Rest',
    'ProcessErrors', 'ClearScope', 'GetBasePath', 'ParseTypeChange', 'Wait',
-    'ToJSON', 'ParseVariableString', 'Prompt', 'InitiatePlaybookRun',
-    'TemplatesService', '$state', InventoriesEdit,
+    'ToJSON', 'ParseVariableString',
+    '$state', InventoriesEdit,
 ];
--- a/awx/ui/client/src/inventories/list/inventory-list.controller.js
+++ b/awx/ui/client/src/inventories/list/inventory-list.controller.js
@ -10,9 +10,9 @@
 * @description This controller's for the Inventory page
 */

-function InventoriesList($scope, $rootScope, $location, $log,
-    $stateParams, $compile, $filter, Rest, Alert, InventoryList, Prompt,
-    ClearScope, ProcessErrors, GetBasePath, Wait, Find, Empty, $state, rbacUiControlService, Dataset) {
+function InventoriesList($scope, $rootScope, $location,
+    $compile, $filter, Rest, InventoryList, Prompt,
+    ProcessErrors, GetBasePath, Wait, Find, Empty, $state, rbacUiControlService, Dataset) {

    let list = InventoryList,
        defaultUrl = GetBasePath('inventory');
@ -303,7 +303,7 @@ function InventoriesList($scope, $rootScope, $location, $log,
    };
 }

-export default ['$scope', '$rootScope', '$location', '$log',
-    '$stateParams', '$compile', '$filter', 'Rest', 'Alert', 'InventoryList',
-    'Prompt', 'ClearScope', 'ProcessErrors', 'GetBasePath', 'Wait', 'Find', 'Empty', '$state', 'rbacUiControlService', 'Dataset', InventoriesList
+export default ['$scope', '$rootScope', '$location',
+    '$compile', '$filter', 'Rest', 'InventoryList',
+    'Prompt', 'ProcessErrors', 'GetBasePath', 'Wait', 'Find', 'Empty', '$state', 'rbacUiControlService', 'Dataset', InventoriesList
 ];
--- a/awx/ui/client/src/inventories/manage/adhoc/adhoc.controller.js
+++ b/awx/ui/client/src/inventories/manage/adhoc/adhoc.controller.js
@ -9,10 +9,10 @@
 * @name controllers.function:Adhoc
 * @description This controller controls the adhoc form creation, command launching and navigating to standard out after command has been succesfully ran.
 */
-function adhocController($q, $scope, $location, $stateParams,
+function adhocController($q, $scope, $stateParams,
    $state, CheckPasswords, PromptForPasswords, CreateLaunchDialog, CreateSelect2, adhocForm,
    GenerateForm, Rest, ProcessErrors, ClearScope, GetBasePath, GetChoices,
-    KindChange, CredentialList, Empty, Wait) {
+    KindChange, Wait) {

    ClearScope();

@ -294,8 +294,8 @@ function adhocController($q, $scope, $location, $stateParams,

 }

-export default ['$q', '$scope', '$location', '$stateParams',
+export default ['$q', '$scope', '$stateParams',
    '$state', 'CheckPasswords', 'PromptForPasswords', 'CreateLaunchDialog', 'CreateSelect2',
     'adhocForm', 'GenerateForm', 'Rest', 'ProcessErrors', 'ClearScope', 'GetBasePath',
-    'GetChoices', 'KindChange', 'CredentialList', 'Empty', 'Wait',
+    'GetChoices', 'KindChange', 'Wait',
    adhocController];
--- a/awx/ui/client/src/inventories/manage/copy-move/copy-move-groups.controller.js
+++ b/awx/ui/client/src/inventories/manage/copy-move/copy-move-groups.controller.js
@ -5,8 +5,8 @@
 *************************************************/

 export default
-    ['$scope', '$state', '$stateParams', 'GroupManageService', 'GetBasePath', 'CopyMoveGroupList', 'group', 'Dataset',
-    function($scope, $state, $stateParams, GroupManageService, GetBasePath, CopyMoveGroupList, group, Dataset){
+    ['$scope', '$state', '$stateParams', 'GroupManageService', 'CopyMoveGroupList', 'group', 'Dataset',
+    function($scope, $state, $stateParams, GroupManageService, CopyMoveGroupList, group, Dataset){
        var list = CopyMoveGroupList;

        $scope.item = group;
--- a/awx/ui/client/src/inventories/manage/copy-move/copy-move-hosts.controller.js
+++ b/awx/ui/client/src/inventories/manage/copy-move/copy-move-hosts.controller.js
@ -5,8 +5,8 @@
 *************************************************/

 export default
-    ['$scope', '$state', '$stateParams', 'generateList', 'HostManageService', 'GetBasePath', 'CopyMoveGroupList', 'host', 'Dataset',
-    function($scope, $state, $stateParams, GenerateList, HostManageService, GetBasePath, CopyMoveGroupList, host, Dataset){
+    ['$scope', '$state', '$stateParams', 'HostManageService', 'CopyMoveGroupList', 'host', 'Dataset',
+    function($scope, $state, $stateParams, HostManageService, CopyMoveGroupList, host, Dataset){
        var list = CopyMoveGroupList;

        $scope.item = host;
--- a/awx/ui/client/src/inventories/manage/groups/factories/view-update-status.factory.js
+++ b/awx/ui/client/src/inventories/manage/groups/factories/view-update-status.factory.js
@ -1,5 +1,5 @@
 export default
-    function ViewUpdateStatus($state, Rest, ProcessErrors, GetBasePath, Alert, Wait, Empty, Find) {
+    function ViewUpdateStatus($state, Rest, ProcessErrors, Alert, Wait, Empty, Find) {
        return function(params) {
            var scope = params.scope,
            group_id = params.group_id,
@ -42,5 +42,5 @@ export default

 ViewUpdateStatus.$inject =
    [   '$state', 'Rest', 'ProcessErrors',
-        'GetBasePath', 'Alert', 'Wait', 'Empty', 'Find'
+        'Alert', 'Wait', 'Empty', 'Find'
    ];
--- a/awx/ui/client/src/inventories/manage/groups/groups-add.controller.js
+++ b/awx/ui/client/src/inventories/manage/groups/groups-add.controller.js
@ -4,9 +4,9 @@
 * All Rights Reserved
 *************************************************/

-export default ['$state', '$stateParams', '$scope', 'GroupForm', 'CredentialList', 'ParseTypeChange', 'GenerateForm', 'inventoryData',
+export default ['$state', '$stateParams', '$scope', 'GroupForm', 'ParseTypeChange', 'GenerateForm', 'inventoryData',
                'GroupManageService', 'GetChoices', 'GetBasePath', 'CreateSelect2', 'GetSourceTypeOptions', 'rbacUiControlService', 'ToJSON',
-                function($state, $stateParams, $scope, GroupForm, CredentialList,  ParseTypeChange, GenerateForm, inventoryData,
+                function($state, $stateParams, $scope, GroupForm,  ParseTypeChange, GenerateForm, inventoryData,
                         GroupManageService, GetChoices, GetBasePath, CreateSelect2, GetSourceTypeOptions, rbacUiControlService, ToJSON) {

        let form = GroupForm();
--- a/awx/ui/client/src/inventories/manage/groups/groups-edit.controller.js
+++ b/awx/ui/client/src/inventories/manage/groups/groups-edit.controller.js
@ -4,9 +4,9 @@
 * All Rights Reserved
 *************************************************/

-export default ['$state', '$stateParams', '$scope', 'ToggleNotification', 'ParseVariableString', 'rbacUiControlService', 'ToJSON',
+export default ['$state', '$stateParams', '$scope', 'ParseVariableString', 'rbacUiControlService', 'ToJSON',
    'ParseTypeChange', 'GroupManageService', 'GetChoices', 'GetBasePath', 'CreateSelect2', 'GetSourceTypeOptions', 'groupData', 'inventorySourceData',
-    function($state, $stateParams, $scope, ToggleNotification, ParseVariableString, rbacUiControlService, ToJSON,
+    function($state, $stateParams, $scope, ParseVariableString, rbacUiControlService, ToJSON,
        ParseTypeChange, GroupManageService, GetChoices, GetBasePath, CreateSelect2, GetSourceTypeOptions, groupData, inventorySourceData) {

        init();
--- a/awx/ui/client/src/inventories/manage/groups/groups-list.controller.js
+++ b/awx/ui/client/src/inventories/manage/groups/groups-list.controller.js
@ -4,12 +4,12 @@
 * All Rights Reserved
 *************************************************/
 export default
-    ['$scope', '$rootScope', '$state', '$stateParams', 'InventoryGroups', 'generateList', 'InventoryUpdate',
+    ['$scope', '$rootScope', '$state', '$stateParams', 'InventoryGroups', 'InventoryUpdate',
    'GroupManageService', 'GroupsCancelUpdate', 'ViewUpdateStatus', 'rbacUiControlService', 'GetBasePath',
-    'InventoryManageService', 'groupsUrl', 'GetSyncStatusMsg', 'GetHostsStatusMsg', 'groupsDataset', 'Find', 'QuerySet',
-    function($scope, $rootScope, $state, $stateParams, InventoryGroups, generateList, InventoryUpdate,
+    'GetSyncStatusMsg', 'GetHostsStatusMsg', 'groupsDataset', 'Find', 'QuerySet',
+    function($scope, $rootScope, $state, $stateParams, InventoryGroups, InventoryUpdate,
        GroupManageService, GroupsCancelUpdate, ViewUpdateStatus, rbacUiControlService, GetBasePath,
-        InventoryManageService, groupsUrl, GetSyncStatusMsg, GetHostsStatusMsg, groupsDataset, Find, qs){
+        GetSyncStatusMsg, GetHostsStatusMsg, groupsDataset, Find, qs){

        let list = InventoryGroups;

--- a/awx/ui/client/src/inventories/manage/hosts/hosts-list.controller.js
+++ b/awx/ui/client/src/inventories/manage/hosts/hosts-list.controller.js
@ -4,9 +4,9 @@
 * All Rights Reserved
 *************************************************/
 export default
-    ['$scope', '$rootScope', '$state', '$stateParams', 'InventoryHosts', 'generateList', 'InventoryManageService', 'HostManageService',
+    ['$scope', '$rootScope', '$state', '$stateParams', 'InventoryHosts', 'HostManageService',
     'hostsUrl', 'SetStatus', 'Prompt', 'Wait', 'inventoryData', '$filter', 'hostsDataset', 'GetBasePath', 'rbacUiControlService', 'QuerySet',
-    function($scope, $rootScope, $state, $stateParams, InventoryHosts, generateList, InventoryManageService, HostManageService,
+    function($scope, $rootScope, $state, $stateParams, InventoryHosts, HostManageService,
     hostsUrl, SetStatus, Prompt, Wait, inventoryData, $filter, hostsDataset, GetBasePath, rbacUiControlService, qs){
        var list = InventoryHosts;

--- a/awx/ui/client/src/inventory-scripts/add/add.controller.js
+++ b/awx/ui/client/src/inventory-scripts/add/add.controller.js
@ -4,11 +4,11 @@
 * All Rights Reserved
 *************************************************/

-export default ['$rootScope', 'Rest', 'Wait',
-    'InventoryScriptsForm', 'ProcessErrors', 'GetBasePath', 'Empty',
+export default ['Rest', 'Wait',
+    'InventoryScriptsForm', 'ProcessErrors', 'GetBasePath',
    'GenerateForm',  '$scope', '$state', 'Alert',
-    function($rootScope, Rest, Wait,
-        InventoryScriptsForm, ProcessErrors, GetBasePath, Empty,
+    function(Rest, Wait,
+        InventoryScriptsForm, ProcessErrors, GetBasePath,
        GenerateForm, $scope, $state, Alert
    ) {
        var form = InventoryScriptsForm,
--- a/awx/ui/client/src/inventory-scripts/edit/edit.controller.js
+++ b/awx/ui/client/src/inventory-scripts/edit/edit.controller.js
@ -6,11 +6,11 @@

 export default ['Rest', 'Wait',
    'InventoryScriptsForm', 'ProcessErrors', 'GetBasePath',
-    'GenerateForm', 'OrganizationList', 'inventory_scriptData',
+    'GenerateForm', 'inventory_scriptData',
    '$scope', '$state',
    function(
        Rest, Wait, InventoryScriptsForm, ProcessErrors, GetBasePath,
-        GenerateForm, OrganizationList, inventory_scriptData,
+        GenerateForm, inventory_scriptData,
        $scope, $state
    ) {
        var generator = GenerateForm,
--- a/awx/ui/client/src/inventory-scripts/list/list.controller.js
+++ b/awx/ui/client/src/inventory-scripts/list/list.controller.js
@ -4,10 +4,10 @@
 * All Rights Reserved
 *************************************************/

-export default ['$rootScope', '$scope', 'Wait', 'generateList', 'InventoryScriptsList',
+export default ['$rootScope', '$scope', 'Wait', 'InventoryScriptsList',
    'GetBasePath', 'Rest', 'ProcessErrors', 'Prompt', '$state', '$filter', 'Dataset', 'rbacUiControlService',
    function(
-        $rootScope, $scope, Wait, GenerateList, InventoryScriptsList,
+        $rootScope, $scope, Wait, InventoryScriptsList,
        GetBasePath, Rest, ProcessErrors, Prompt, $state, $filter, Dataset, rbacUiControlService
    ) {
        var defaultUrl = GetBasePath('inventory_scripts'),
--- a/awx/ui/client/src/job-results/host-event/host-event.controller.js
+++ b/awx/ui/client/src/job-results/host-event/host-event.controller.js
@ -6,8 +6,8 @@


 export default
-    ['$stateParams', '$scope', '$state', 'Wait', 'jobResultsService', 'hostEvent',
-    function($stateParams, $scope, $state, Wait, jobResultsService, hostEvent){
+    ['$scope', '$state', 'jobResultsService', 'hostEvent',
+    function($scope, $state, jobResultsService, hostEvent){

        $scope.processEventStatus = jobResultsService.processEventStatus;
        $scope.processResults = function(value){
--- a/awx/ui/client/src/job-results/job-results.controller.js
+++ b/awx/ui/client/src/job-results/job-results.controller.js
@ -1,5 +1,5 @@
-export default ['jobData', 'jobDataOptions', 'jobLabels', 'jobFinished', 'count', '$scope', 'ParseTypeChange', 'ParseVariableString', 'jobResultsService', 'eventQueue', '$compile', '$log', 'Dataset', '$q', 'Rest', '$state', 'QuerySet', '$rootScope', 'moment', '$stateParams', 'i18n', 'fieldChoices', 'fieldLabels', 'workflowResultsService', 'statusSocket',
-function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTypeChange, ParseVariableString, jobResultsService, eventQueue, $compile, $log, Dataset, $q, Rest, $state, QuerySet, $rootScope, moment, $stateParams, i18n, fieldChoices, fieldLabels, workflowResultsService, statusSocket) {
+export default ['jobData', 'jobDataOptions', 'jobLabels', 'jobFinished', 'count', '$scope', 'ParseTypeChange', 'ParseVariableString', 'jobResultsService', 'eventQueue', '$compile', '$log', 'Dataset', '$q', 'QuerySet', '$rootScope', 'moment', '$stateParams', 'i18n', 'fieldChoices', 'fieldLabels', 'workflowResultsService', 'statusSocket',
+function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTypeChange, ParseVariableString, jobResultsService, eventQueue, $compile, $log, Dataset, $q, QuerySet, $rootScope, moment, $stateParams, i18n, fieldChoices, fieldLabels, workflowResultsService, statusSocket) {
    var toDestroy = [];
    var cancelRequests = false;
    var runTimeElapsedTimer = null;
--- a/awx/ui/client/src/job-submission/job-submission-factories/adhoc-run.factory.js
+++ b/awx/ui/client/src/job-submission/job-submission-factories/adhoc-run.factory.js
@ -40,8 +40,8 @@
 */

 export default
-     function AdhocRun($location, $stateParams, LaunchJob, PromptForPasswords,
-         Rest, GetBasePath, Alert, ProcessErrors, Wait, Empty, CreateLaunchDialog, $state) {
+     function AdhocRun($location, PromptForPasswords,
+         Rest, GetBasePath, ProcessErrors, Wait, Empty, CreateLaunchDialog, $state) {
         return function(params) {
             var id = params.project_id,
                 scope = params.scope.$new(),
@ -156,7 +156,7 @@
     }

 AdhocRun.$inject =
-     [   '$location','$stateParams', 'LaunchJob',
-         'PromptForPasswords', 'Rest', 'GetBasePath', 'Alert', 'ProcessErrors',
+     [   '$location',
+         'PromptForPasswords', 'Rest', 'GetBasePath', 'ProcessErrors',
         'Wait', 'Empty', 'CreateLaunchDialog', '$state'
     ];
--- a/awx/ui/client/src/job-submission/job-submission-factories/initiateplaybookrun.factory.js
+++ b/awx/ui/client/src/job-submission/job-submission-factories/initiateplaybookrun.factory.js
@ -1,5 +1,5 @@
 export default
-    function InitiatePlaybookRun($location, GetBasePath, Empty, $compile) {
+    function InitiatePlaybookRun($compile) {

            // This factory drops the submit-job directive into the dom which
            // either launches the job (when no user input is needed) or shows
@ -19,8 +19,5 @@ export default
        }

 InitiatePlaybookRun.$inject =
-    [   '$location',
-        'GetBasePath',
-        'Empty',
-        '$compile'
+    [   '$compile'
    ];
--- a/awx/ui/client/src/job-submission/job-submission-factories/inventory-update.factory.js
+++ b/awx/ui/client/src/job-submission/job-submission-factories/inventory-update.factory.js
@ -1,5 +1,5 @@
 export default
-    function InventoryUpdate(PromptForPasswords, LaunchJob, Rest, GetBasePath, ProcessErrors, Alert, Wait) {
+    function InventoryUpdate(PromptForPasswords, LaunchJob, Rest, ProcessErrors, Alert, Wait) {
        return function (params) {

            var scope = params.scope,
@ -69,7 +69,6 @@ InventoryUpdate.$inject =
    [   'PromptForPasswords',
        'LaunchJob',
        'Rest',
-        'GetBasePath',
        'ProcessErrors',
        'Alert',
        'Wait'
--- a/awx/ui/client/src/job-submission/job-submission.controller.js
+++ b/awx/ui/client/src/job-submission/job-submission.controller.js
@ -62,11 +62,11 @@
 */

 export default
-    [   '$scope', '$location', 'GetBasePath', 'Empty', 'Wait', 'Rest', 'ProcessErrors',
-        'LaunchJob', '$state', 'generateList', 'InventoryList', 'CredentialList', 'ParseTypeChange',
+    [   '$scope', 'GetBasePath', 'Wait', 'Rest', 'ProcessErrors',
+        'LaunchJob', '$state', 'InventoryList', 'CredentialList', 'ParseTypeChange',
        'GetSurveyQuestions',
-        function($scope, $location, GetBasePath, Empty, Wait, Rest, ProcessErrors,
-            LaunchJob, $state, GenerateList, InventoryList, CredentialList, ParseTypeChange,
+        function($scope, GetBasePath, Wait, Rest, ProcessErrors,
+            LaunchJob, $state, InventoryList, CredentialList, ParseTypeChange,
            GetSurveyQuestions) {

            var launch_url;
--- a/awx/ui/client/src/jobs/factories/delete-job.factory.js
+++ b/awx/ui/client/src/jobs/factories/delete-job.factory.js
@ -1,5 +1,5 @@
 export default
-    function DeleteJob($state, Find, GetBasePath, Rest, Wait, ProcessErrors, Prompt, Alert,
+    function DeleteJob($state, Find, Rest, Wait, ProcessErrors, Prompt, Alert,
        $filter, i18n) {
        return function(params) {
            var scope = params.scope,
@ -132,6 +132,6 @@ export default
    }

 DeleteJob.$inject =
-    [   '$state', 'Find', 'GetBasePath', 'Rest', 'Wait',
+    [   '$state', 'Find', 'Rest', 'Wait',
        'ProcessErrors', 'Prompt', 'Alert', '$filter', 'i18n'
    ];
--- a/awx/ui/client/src/jobs/factories/relaunch-inventory.factory.js
+++ b/awx/ui/client/src/jobs/factories/relaunch-inventory.factory.js
@ -1,5 +1,5 @@
 export default
-    function RelaunchInventory(Find, Wait, Rest, InventoryUpdate, ProcessErrors, GetBasePath) {
+    function RelaunchInventory(Wait, Rest, InventoryUpdate, ProcessErrors, GetBasePath) {
        return function(params) {
            var scope = params.scope,
                id = params.id,
@ -25,6 +25,6 @@ export default
    }

 RelaunchInventory.$inject =
-    [   'Find', 'Wait', 'Rest',
+    [   'Wait', 'Rest',
        'InventoryUpdate', 'ProcessErrors', 'GetBasePath'
    ];
--- a/awx/ui/client/src/jobs/jobs-list.controller.js
+++ b/awx/ui/client/src/jobs/jobs-list.controller.js
@ -10,11 +10,11 @@
 * @description This controller's for the jobs page
 */

- export default ['$state', '$rootScope', '$log', '$scope', '$compile', '$stateParams',
-     'ClearScope', 'Find', 'DeleteJob', 'RelaunchJob', 'AllJobsList', 'ScheduledJobsList',
+ export default ['$state', '$rootScope', '$scope', '$stateParams',
+     'ClearScope', 'Find', 'DeleteJob', 'RelaunchJob',
     'GetBasePath', 'Dataset', 'QuerySet', 'ListDefinition', '$interpolate',
-     function($state, $rootScope, $log, $scope, $compile, $stateParams,
-         ClearScope, Find, DeleteJob, RelaunchJob, AllJobsList, ScheduledJobsList,
+     function($state, $rootScope, $scope, $stateParams,
+         ClearScope, Find, DeleteJob, RelaunchJob,
         GetBasePath, Dataset, qs, ListDefinition, $interpolate) {

    ClearScope();
--- a/awx/ui/client/src/license/license.controller.js
+++ b/awx/ui/client/src/license/license.controller.js
@ -7,10 +7,10 @@
 import {N_} from "../i18n";

 export default
-    ['Wait', '$state', '$scope', '$rootScope', '$location', 'GetBasePath',
-    'Rest', 'ProcessErrors', 'CheckLicense', 'moment','$window',
+    ['Wait', '$state', '$scope', '$rootScope',
+    'ProcessErrors', 'CheckLicense', 'moment','$window',
    'ConfigService', 'FeaturesService', 'pendoService', 'i18n',
-    function( Wait, $state, $scope, $rootScope, $location, GetBasePath, Rest,
+    function( Wait, $state, $scope, $rootScope,
        ProcessErrors, CheckLicense, moment, $window, ConfigService,
        FeaturesService, pendoService, i18n){

--- a/awx/ui/client/src/login/authenticationServices/authentication.service.js
+++ b/awx/ui/client/src/login/authenticationServices/authentication.service.js
@ -15,9 +15,9 @@
 */

 export default
-    ['$http', '$rootScope', '$location', '$cookies', 'GetBasePath', 'Store', '$q',
+    ['$http', '$rootScope', '$cookies', 'GetBasePath', 'Store', '$q',
    '$injector',
-    function ($http, $rootScope, $location, $cookies, GetBasePath, Store, $q,
+    function ($http, $rootScope, $cookies, GetBasePath, Store, $q,
    $injector) {
        return {
            setToken: function (token, expires) {
--- a/awx/ui/client/src/login/authenticationServices/checkAccess.factory.js
+++ b/awx/ui/client/src/login/authenticationServices/checkAccess.factory.js
@ -12,8 +12,8 @@


 export default
-    ['$rootScope', 'Alert', 'Rest', 'GetBasePath', 'ProcessErrors', '$cookies',
-    function ($rootScope, Alert, Rest, GetBasePath, ProcessErrors, $cookies) {
+    ['$rootScope', 'Alert', 'Rest', 'ProcessErrors', '$cookies',
+    function ($rootScope, Alert, Rest, ProcessErrors, $cookies) {
        return function (params) {
            // set PermissionAddAllowed to true or false based on user access. admins and org admins are granted
            // accesss.
--- a/awx/ui/client/src/login/loginModal/loginModal.controller.js
+++ b/awx/ui/client/src/login/loginModal/loginModal.controller.js
@ -54,12 +54,12 @@
 * This is usage information.
 */

-export default ['$log', '$cookies', '$compile', '$window', '$rootScope',
-    '$location', 'Authorization', 'ToggleClass', 'Alert', 'Wait', 'Timer',
-    'Empty', 'ClearScope', '$scope', 'pendoService', 'ConfigService',
+export default ['$log', '$cookies', '$compile', '$rootScope',
+    '$location', 'Authorization', 'Alert', 'Wait', 'Timer',
+    'Empty', '$scope', 'pendoService', 'ConfigService',
    'CheckLicense', 'FeaturesService', 'SocketService',
-    function ($log, $cookies, $compile, $window, $rootScope, $location,
-        Authorization, ToggleClass, Alert, Wait, Timer, Empty, ClearScope,
+    function ($log, $cookies, $compile, $rootScope, $location,
+        Authorization, Alert, Wait, Timer, Empty,
        scope, pendoService, ConfigService, CheckLicense, FeaturesService,
        SocketService) {
    var lastPath, lastUser, sessionExpired, loginAgain;
--- a/awx/ui/client/src/management-jobs/card/card.controller.js
+++ b/awx/ui/client/src/management-jobs/card/card.controller.js
@ -7,13 +7,13 @@
 // import listGenerator from 'tower/shared/list-generator/main';

 export default
-    [   'Wait', '$compile',  'CreateDialog', 'GetBasePath' ,
-        'SchedulesList', 'Rest' ,
-        'ProcessErrors', 'managementJobsListObject', '$rootScope', '$state',
+    [   'Wait',  'CreateDialog', 'GetBasePath' ,
+        'Rest' ,
+        'ProcessErrors', '$rootScope', '$state',
        '$scope', 'CreateSelect2', 'i18n',
-        function( Wait, $compile, CreateDialog, GetBasePath,
-            SchedulesList, Rest, ProcessErrors,
-            managementJobsListObject, $rootScope, $state, $scope,
+        function( Wait, CreateDialog, GetBasePath,
+            Rest, ProcessErrors,
+            $rootScope, $state, $scope,
            CreateSelect2, i18n) {

                var defaultUrl = GetBasePath('system_job_templates') + "?order_by=name";
--- a/awx/ui/client/src/notifications/add/add.controller.js
+++ b/awx/ui/client/src/notifications/add/add.controller.js
@ -4,13 +4,13 @@
 * All Rights Reserved
 *************************************************/

-export default ['$rootScope', 'Rest', 'Wait', 'NotificationsFormObject',
-    'ProcessErrors', 'GetBasePath', 'Empty', 'Alert',
+export default ['Rest', 'Wait', 'NotificationsFormObject',
+    'ProcessErrors', 'GetBasePath', 'Alert',
    'GenerateForm', '$scope', '$state', 'CreateSelect2', 'GetChoices',
    'NotificationsTypeChange', 'ParseTypeChange',
    function(
-        $rootScope, Rest, Wait, NotificationsFormObject,
-        ProcessErrors, GetBasePath, Empty, Alert,
+        Rest, Wait, NotificationsFormObject,
+        ProcessErrors, GetBasePath, Alert,
        GenerateForm, $scope, $state, CreateSelect2, GetChoices,
        NotificationsTypeChange, ParseTypeChange
    ) {
--- a/awx/ui/client/src/notifications/edit/edit.controller.js
+++ b/awx/ui/client/src/notifications/edit/edit.controller.js
@ -7,16 +7,16 @@
 export default ['Rest', 'Wait',
    'NotificationsFormObject', 'ProcessErrors', 'GetBasePath',
    'GenerateForm',
-    'OrganizationList', 'notification_template',
+    'notification_template',
    '$scope', '$state', 'GetChoices', 'CreateSelect2', 'Empty',
-    '$rootScope', 'NotificationsTypeChange', 'ParseTypeChange',
+    'NotificationsTypeChange', 'ParseTypeChange',
    function(
        Rest, Wait,
        NotificationsFormObject, ProcessErrors, GetBasePath,
        GenerateForm,
-        OrganizationList, notification_template,
+        notification_template,
        $scope, $state, GetChoices, CreateSelect2, Empty,
-        $rootScope, NotificationsTypeChange, ParseTypeChange
+        NotificationsTypeChange, ParseTypeChange
    ) {
        var generator = GenerateForm,
            id = notification_template.id,
--- a/awx/ui/client/src/notifications/notification-templates-list/list.controller.js
+++ b/awx/ui/client/src/notifications/notification-templates-list/list.controller.js
@ -4,14 +4,14 @@
  * All Rights Reserved
  *************************************************/

- export default ['$rootScope', '$scope', 'Wait', 'generateList', 'NotificationTemplatesList',
-     'GetBasePath', 'Rest', 'ProcessErrors', 'Prompt', '$state', 'GetChoices',
-     'Empty', 'Find', 'ngToast', '$compile', '$filter', 'Dataset', 'rbacUiControlService',
+ export default ['$scope', 'Wait', 'NotificationTemplatesList',
+     'GetBasePath', 'Rest', 'ProcessErrors', 'Prompt', '$state',
+     'ngToast', '$filter', 'Dataset', 'rbacUiControlService',
     'i18n',
     function(
-         $rootScope, $scope, Wait, GenerateList, NotificationTemplatesList,
-         GetBasePath, Rest, ProcessErrors, Prompt, $state, GetChoices,
-         Empty, Find, ngToast, $compile, $filter, Dataset, rbacUiControlService,
+         $scope, Wait, NotificationTemplatesList,
+         GetBasePath, Rest, ProcessErrors, Prompt, $state,
+         ngToast, $filter, Dataset, rbacUiControlService,
         i18n) {

         var defaultUrl = GetBasePath('notification_templates'),
--- a/awx/ui/client/src/notifications/shared/toggle-notification.factory.js
+++ b/awx/ui/client/src/notifications/shared/toggle-notification.factory.js
@ -14,8 +14,8 @@
 *
 */

-export default ['Wait', 'GetBasePath', 'ProcessErrors', 'Rest',
-    function(Wait, GetBasePath, ProcessErrors, Rest) {
+export default ['Wait', 'ProcessErrors', 'Rest',
+    function(Wait, ProcessErrors, Rest) {
    return function(params) {
        var scope = params.scope,
            notifier = params.notifier,
--- a/awx/ui/client/src/organizations/edit/organizations-edit.controller.js
+++ b/awx/ui/client/src/organizations/edit/organizations-edit.controller.js
@ -4,11 +4,11 @@
 * All Rights Reserved
 *************************************************/

-export default ['$scope', '$rootScope', '$location', '$log', '$stateParams',
-    'OrganizationForm', 'Rest', 'Alert', 'ProcessErrors', 'Prompt', 'ClearScope',
+export default ['$scope', '$location', '$stateParams',
+    'OrganizationForm', 'Rest', 'ProcessErrors', 'Prompt', 'ClearScope',
    'GetBasePath', 'Wait', '$state', 'ToggleNotification',
-    function($scope, $rootScope, $location, $log, $stateParams,
-        OrganizationForm, Rest, Alert, ProcessErrors, Prompt, ClearScope,
+    function($scope, $location, $stateParams,
+        OrganizationForm, Rest, ProcessErrors, Prompt, ClearScope,
        GetBasePath, Wait, $state, ToggleNotification) {

        ClearScope();
--- a/awx/ui/client/src/organizations/linkout/addUsers/addUsers.controller.js
+++ b/awx/ui/client/src/organizations/linkout/addUsers/addUsers.controller.js
@ -12,9 +12,9 @@
 */

 export default ['$scope', '$rootScope', 'ProcessErrors', 'GetBasePath', 'generateList',
-'templateUrl', '$state', 'Rest', '$q', 'Wait', '$window', 'QuerySet', 'UserList',
+'$state', 'Rest', '$q', 'Wait', '$window', 'QuerySet', 'UserList',
 function($scope, $rootScope, ProcessErrors, GetBasePath, generateList,
-    templateUrl, $state, Rest, $q, Wait, $window, qs, UserList) {
+    $state, Rest, $q, Wait, $window, qs, UserList) {
    $scope.$on("linkLists", function() {

        if ($state.current.name.split(".")[1] === "users") {
--- a/awx/ui/client/src/organizations/linkout/addUsers/addUsers.directive.js
+++ b/awx/ui/client/src/organizations/linkout/addUsers/addUsers.directive.js
@ -7,7 +7,7 @@
 /* jshint unused: vars */
 import addUsers from './addUsers.controller';
 export default
-    ['Wait', 'templateUrl', '$state', '$view', '$compile', function(Wait, templateUrl, $state, $view, $compile) {
+    ['Wait', 'templateUrl', '$compile', function(Wait, templateUrl, $compile) {
            return {
                restrict: 'E',
                scope: {
--- a/awx/ui/client/src/organizations/linkout/controllers/organizations-admins.controller.js
+++ b/awx/ui/client/src/organizations/linkout/controllers/organizations-admins.controller.js
@ -4,11 +4,11 @@
 * All Rights Reserved
 *************************************************/

-export default ['$stateParams', '$scope', 'UserList', 'Rest', '$state',
-    'generateList', '$compile', 'Wait', 'OrgAdminList',
+export default ['$stateParams', '$scope', 'Rest', '$state',
+    '$compile', 'Wait', 'OrgAdminList',
    'OrgAdminsDataset',
    'Prompt', 'ProcessErrors', 'GetBasePath', '$filter',
-    function($stateParams, $scope, UserList, Rest, $state, GenerateList,
+    function($stateParams, $scope, Rest, $state,
        $compile, Wait, OrgAdminList, OrgAdminsDataset, Prompt, ProcessErrors,
        GetBasePath, $filter) {

--- a/awx/ui/client/src/organizations/linkout/controllers/organizations-inventories.controller.js
+++ b/awx/ui/client/src/organizations/linkout/controllers/organizations-inventories.controller.js
@ -4,14 +4,14 @@
 * All Rights Reserved
 *************************************************/

-export default ['$scope', '$rootScope', '$location', '$log',
-    '$stateParams', '$compile', '$filter', 'Rest', 'Alert', 'InventoryList',
-    'generateList', 'Prompt', 'ReturnToCaller', 'OrgInventoryDataset', 'OrgInventoryList',
-    'ClearScope', 'ProcessErrors', 'GetBasePath', 'Wait', 'Find', 'Empty', '$state',
-    function($scope, $rootScope, $location, $log,
-        $stateParams, $compile, $filter, Rest, Alert, InventoryList,
-        generateList, Prompt, ReturnToCaller, Dataset, OrgInventoryList,
-        ClearScope, ProcessErrors, GetBasePath, Wait,
+export default ['$scope', '$rootScope', '$location',
+    '$stateParams', '$compile', '$filter', 'Rest', 'InventoryList',
+    'OrgInventoryDataset', 'OrgInventoryList',
+    'ProcessErrors', 'GetBasePath', 'Wait', 'Find', 'Empty', '$state',
+    function($scope, $rootScope, $location,
+        $stateParams, $compile, $filter, Rest, InventoryList,
+        Dataset, OrgInventoryList,
+        ProcessErrors, GetBasePath, Wait,
        Find, Empty, $state) {

        var list = OrgInventoryList,
--- a/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js
+++ b/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js
@ -4,14 +4,14 @@
 * All Rights Reserved
 *************************************************/

-export default ['$scope', '$rootScope', '$location', '$log',
-    '$stateParams', 'Rest', 'Alert', 'Prompt', 'ReturnToCaller', 'ClearScope', 'ProcessErrors',
-    'GetBasePath', 'JobTemplateForm', 'InitiatePlaybookRun', 'Wait', 'TemplateCopyService',
-    '$compile', '$state', 'OrgJobTemplateList', 'OrgJobTemplateDataset', 'QuerySet',
-    function($scope, $rootScope, $location, $log,
-        $stateParams, Rest, Alert, Prompt, ReturnToCaller, ClearScope, ProcessErrors,
-        GetBasePath, JobTemplateForm, InitiatePlaybookRun, Wait, TemplateCopyService,
-        $compile, $state, OrgJobTemplateList, Dataset, qs) {
+export default ['$scope', '$rootScope',
+    '$stateParams', 'Rest', 'ProcessErrors',
+    'GetBasePath', 'InitiatePlaybookRun', 'Wait', 'TemplateCopyService',
+    '$state', 'OrgJobTemplateList', 'OrgJobTemplateDataset', 'QuerySet',
+    function($scope, $rootScope,
+        $stateParams, Rest, ProcessErrors,
+        GetBasePath, InitiatePlaybookRun, Wait, TemplateCopyService,
+        $state, OrgJobTemplateList, Dataset, qs) {

        var list = OrgJobTemplateList,
            orgBase = GetBasePath('organizations');
--- a/awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js
+++ b/awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js
@ -4,13 +4,13 @@
 * All Rights Reserved
 *************************************************/

-export default ['$scope', '$rootScope', '$location', '$log',
-    '$stateParams', 'Rest', 'Alert', 'Prompt',
-    'ReturnToCaller', 'ClearScope', 'OrgProjectList', 'OrgProjectDataset',
+export default ['$scope', '$rootScope', '$log',
+    '$stateParams', 'Rest', 'Alert',
+    'OrgProjectList', 'OrgProjectDataset',
    'ProcessErrors', 'GetBasePath', 'ProjectUpdate',
    'Wait', 'GetChoices', 'Empty', 'Find', 'GetProjectIcon', 'GetProjectToolTip', '$filter', '$state',
-    function($scope, $rootScope, $location, $log, $stateParams, Rest, Alert, Prompt,
-        ReturnToCaller, ClearScope, OrgProjectList, Dataset,
+    function($scope, $rootScope, $log, $stateParams, Rest, Alert,
+        OrgProjectList, Dataset,
        ProcessErrors, GetBasePath, ProjectUpdate,
        Wait, GetChoices, Empty, Find, GetProjectIcon, GetProjectToolTip, $filter, $state) {

--- a/awx/ui/client/src/organizations/linkout/controllers/organizations-teams.controller.js
+++ b/awx/ui/client/src/organizations/linkout/controllers/organizations-teams.controller.js
@ -4,14 +4,10 @@
 * All Rights Reserved
 *************************************************/

-export default ['$scope', '$rootScope', '$location', '$log', '$stateParams', 'OrgTeamList',
-    'Rest', 'Alert', 'Prompt', 'OrgTeamsDataset', 'ReturnToCaller', 'ClearScope',
-    'ProcessErrors', 'GetBasePath',
-    'Wait', '$state',
-    function($scope, $rootScope, $location, $log, $stateParams, OrgTeamList,
-        Rest, Alert, Prompt, Dataset, ReturnToCaller, ClearScope,
-        ProcessErrors, GetBasePath,
-        Wait, $state) {
+export default ['$scope', '$stateParams', 'OrgTeamList', 'Rest', 'OrgTeamsDataset',
+    'GetBasePath', '$state',
+    function($scope, $stateParams, OrgTeamList, Rest, Dataset,
+    GetBasePath, $state) {

        var list = OrgTeamList,
            orgBase = GetBasePath('organizations');
--- a/awx/ui/client/src/organizations/linkout/controllers/organizations-users.controller.js
+++ b/awx/ui/client/src/organizations/linkout/controllers/organizations-users.controller.js
@ -5,9 +5,9 @@
 *************************************************/

 export default ['$stateParams', '$scope', 'OrgUserList','Rest', '$state',
-    'generateList', '$compile', 'Wait', 'OrgUsersDataset',
+    '$compile', 'Wait', 'OrgUsersDataset',
    'Prompt', 'ProcessErrors', 'GetBasePath', '$filter',
-    function($stateParams, $scope, OrgUserList, Rest, $state, GenerateList,
+    function($stateParams, $scope, OrgUserList, Rest, $state,
        $compile, Wait, OrgUsersDataset, Prompt, ProcessErrors,
        GetBasePath, $filter) {

--- a/awx/ui/client/src/organizations/list/organizations-list.controller.js
+++ b/awx/ui/client/src/organizations/list/organizations-list.controller.js
@ -5,11 +5,11 @@
 *************************************************/


-export default ['$stateParams', '$scope', '$rootScope', '$location',
-    '$log', '$compile', 'Rest', 'OrganizationList', 'Alert', 'Prompt', 'ClearScope',
+export default ['$stateParams', '$scope', '$rootScope',
+    'Rest', 'OrganizationList', 'Prompt', 'ClearScope',
    'ProcessErrors', 'GetBasePath', 'Wait', '$state', 'rbacUiControlService', '$filter', 'Dataset', 'i18n',
-    function($stateParams, $scope, $rootScope, $location,
-        $log, $compile, Rest, OrganizationList, Alert, Prompt, ClearScope,
+    function($stateParams, $scope, $rootScope,
+        Rest, OrganizationList, Prompt, ClearScope,
        ProcessErrors, GetBasePath, Wait, $state, rbacUiControlService, $filter, Dataset, i18n) {

        ClearScope();
--- a/awx/ui/client/src/portal-mode/portal-mode-jobs.controller.js
+++ b/awx/ui/client/src/portal-mode/portal-mode-jobs.controller.js
@ -4,7 +4,7 @@
 * All Rights Reserved
 *************************************************/

-export function PortalModeJobsController($scope, $rootScope, $state, $stateParams, qs, GetBasePath, PortalJobsList, Dataset) {
+export function PortalModeJobsController($scope, $state, qs, GetBasePath, PortalJobsList, Dataset) {

    var list = PortalJobsList;

@ -38,4 +38,4 @@ export function PortalModeJobsController($scope, $rootScope, $state, $stateParam
    };
 }

-PortalModeJobsController.$inject = ['$scope', '$rootScope', '$state', '$stateParams', 'QuerySet', 'GetBasePath', 'PortalJobsList', 'jobsDataset'];
+PortalModeJobsController.$inject = ['$scope', '$state', 'QuerySet', 'GetBasePath', 'PortalJobsList', 'jobsDataset'];
--- a/awx/ui/client/src/projects/list/projects-list.controller.js
+++ b/awx/ui/client/src/projects/list/projects-list.controller.js
@ -4,11 +4,11 @@
 * All Rights Reserved
 *************************************************/

-export default ['$scope', '$rootScope', '$log', '$stateParams', 'Rest', 'Alert',
+export default ['$scope', '$rootScope', '$log', 'Rest', 'Alert',
    'ProjectList', 'Prompt', 'ProcessErrors', 'GetBasePath', 'ProjectUpdate',
    'Wait', 'Empty', 'Find', 'GetProjectIcon', 'GetProjectToolTip', '$filter',
    '$state', 'rbacUiControlService', 'Dataset', 'i18n', 'QuerySet',
-    function($scope, $rootScope, $log, $stateParams,Rest, Alert, ProjectList,
+    function($scope, $rootScope, $log, Rest, Alert, ProjectList,
    Prompt, ProcessErrors, GetBasePath, ProjectUpdate, Wait, Empty, Find,
    GetProjectIcon, GetProjectToolTip, $filter, $state, rbacUiControlService,
    Dataset, i18n, qs) {
--- a/awx/ui/client/src/rest/restServices.factory.js
+++ b/awx/ui/client/src/rest/restServices.factory.js
@ -55,8 +55,8 @@
 */

 export default
-    ['$http', '$rootScope', '$cookies', '$q', 'Authorization',
-        function ($http, $rootScope, $cookies, $q, Authorization) {
+    ['$http', '$rootScope', '$q', 'Authorization',
+        function ($http, $rootScope, $q, Authorization) {
            return {

                headers: {},
--- a/awx/ui/client/src/scheduler/schedulerAdd.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerAdd.controller.js
@ -4,11 +4,11 @@
 * All Rights Reserved
 *************************************************/

-export default ['$compile', '$filter', '$state', '$stateParams', 'AddSchedule', 'Wait',
+export default ['$filter', '$state', '$stateParams', 'AddSchedule', 'Wait',
    '$scope', '$rootScope', 'CreateSelect2', 'ParseTypeChange', 'GetBasePath',
-    'Rest', 'ParamPass', 'ParentObject',
-    function($compile, $filter, $state, $stateParams, AddSchedule, Wait, $scope,
-        $rootScope, CreateSelect2, ParseTypeChange, GetBasePath, Rest, ParamPass, ParentObject) {
+    'Rest', 'ParentObject',
+    function($filter, $state, $stateParams, AddSchedule, Wait, $scope,
+        $rootScope, CreateSelect2, ParseTypeChange, GetBasePath, Rest, ParentObject) {
    $scope.processSchedulerEndDt = function(){
        // set the schedulerEndDt to be equal to schedulerStartDt + 1 day @ midnight
        var dt = new Date($scope.schedulerUTCTime);
--- a/awx/ui/client/src/scheduler/schedulerEdit.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
@ -1,5 +1,5 @@
-export default ['$filter', '$compile', '$state', '$stateParams', 'EditSchedule', 'Wait', '$scope', '$rootScope', 'CreateSelect2', 'ParseTypeChange', 'ParentObject',
-function($filter, $compile, $state, $stateParams, EditSchedule, Wait, $scope, $rootScope, CreateSelect2, ParseTypeChange, ParentObject) {
+export default ['$filter', '$state', '$stateParams', 'EditSchedule', 'Wait', '$scope', '$rootScope', 'CreateSelect2', 'ParseTypeChange', 'ParentObject',
+function($filter, $state, $stateParams, EditSchedule, Wait, $scope, $rootScope, CreateSelect2, ParseTypeChange, ParentObject) {

    $scope.processSchedulerEndDt = function(){
        // set the schedulerEndDt to be equal to schedulerStartDt + 1 day @ midnight
--- a/awx/ui/client/src/scheduler/schedulerList.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerList.controller.js
@ -12,13 +12,13 @@


 export default [
-    '$scope', '$compile', '$location', '$stateParams', 'ScheduleList', 'Rest',
-    'ProcessErrors', 'ReturnToCaller', 'ClearScope', 'GetBasePath', 'Wait', 'rbacUiControlService',
-    'Find', 'ToggleSchedule', 'DeleteSchedule', 'GetChoices', '$q', '$state', 'Dataset', 'ParentObject', 'UnifiedJobsOptions',
-    function($scope, $compile, $location, $stateParams,
-        ScheduleList, Rest, ProcessErrors, ReturnToCaller, ClearScope,
-        GetBasePath, Wait, rbacUiControlService, Find,
-        ToggleSchedule, DeleteSchedule, GetChoices,
+    '$scope', '$location', '$stateParams', 'ScheduleList', 'Rest',
+    'ClearScope', 'rbacUiControlService',
+    'ToggleSchedule', 'DeleteSchedule', '$q', '$state', 'Dataset', 'ParentObject', 'UnifiedJobsOptions',
+    function($scope, $location, $stateParams,
+        ScheduleList, Rest, ClearScope,
+        rbacUiControlService,
+        ToggleSchedule, DeleteSchedule,
        $q, $state, Dataset, ParentObject, UnifiedJobsOptions) {

        ClearScope();
--- a/awx/ui/client/src/shared/features/features.service.js
+++ b/awx/ui/client/src/shared/features/features.service.js
@ -4,10 +4,8 @@
 * All Rights Reserved
 *************************************************/

-export default ['$rootScope', 'Rest', 'GetBasePath', 'ProcessErrors', '$http',
-    '$q', 'ConfigService',
-function ($rootScope, Rest, GetBasePath, ProcessErrors, $http, $q,
-    ConfigService) {
+export default ['$rootScope', 'ConfigService',
+function ($rootScope, ConfigService) {
    return {
            get: function(){
                if (_.isEmpty($rootScope.features)) {
--- a/awx/ui/client/src/shared/form-generator.js
+++ b/awx/ui/client/src/shared/form-generator.js
@ -139,13 +139,13 @@ import listGenerator from './list-generator/main';
 export default
 angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerator.name])

-.factory('GenerateForm', ['$rootScope', '$location', '$compile', 'generateList',
+.factory('GenerateForm', ['$rootScope', '$compile', 'generateList',
    'Attr', 'Icon', 'Column',
-    'NavigationLink', 'HelpCollapse', 'DropDown', 'Empty', 'SelectIcon',
-    'Store', 'ActionButton', '$log', 'i18n',
-    function ($rootScope, $location, $compile, GenerateList,
+    'NavigationLink', 'HelpCollapse', 'Empty', 'SelectIcon',
+    'ActionButton', '$log', 'i18n',
+    function ($rootScope, $compile, GenerateList,
        Attr, Icon, Column, NavigationLink, HelpCollapse,
-        DropDown, Empty, SelectIcon, Store, ActionButton, $log, i18n) {
+        Empty, SelectIcon, ActionButton, $log, i18n) {
        return {

            setForm: function (form) { this.form = form; },
--- a/awx/ui/client/src/shared/list-generator/list-generator.factory.js
+++ b/awx/ui/client/src/shared/list-generator/list-generator.factory.js
@ -97,9 +97,9 @@

 import { templateUrl } from '../../shared/template-url/template-url.factory';

-export default ['$location', '$compile', '$rootScope', 'Attr', 'Icon',
-    'Column', 'DropDown', 'NavigationLink', 'SelectIcon', 'ActionButton', 'i18n',
-    function($location, $compile, $rootScope, Attr, Icon, Column, DropDown, NavigationLink,
+export default ['$compile', 'Attr', 'Icon',
+    'Column', 'DropDown', 'SelectIcon', 'ActionButton', 'i18n',
+    function($compile, Attr, Icon, Column, DropDown,
        SelectIcon, ActionButton, i18n) {
        return {

--- a/awx/ui/client/src/shared/list-generator/toolbar-button.directive.js
+++ b/awx/ui/client/src/shared/list-generator/toolbar-button.directive.js
@ -4,7 +4,7 @@
 * All Rights Reserved
 *************************************************/

-export default ['$compile', 'Attr', 'SelectIcon', function($compile, Attr, SelectIcon) {
+export default ['SelectIcon', function(SelectIcon) {
    return {
        restrict: 'A',
        scope: {},
--- a/awx/ui/client/src/shared/load-config/load-config.factory.js
+++ b/awx/ui/client/src/shared/load-config/load-config.factory.js
@ -1,5 +1,5 @@
 export default
-    function LoadConfig($log, $rootScope, $http, $location, GetBasePath, ProcessErrors, Rest, Store) {
+    function LoadConfig($log, $rootScope, $http, Store) {
        return function() {

            // These ettings used to be found in config.js, hardcoded now.
@ -82,6 +82,6 @@ export default
    }

 LoadConfig.$inject =
-    [   '$log', '$rootScope', '$http', '$location',
-        'GetBasePath', 'ProcessErrors', 'Rest', 'Store'
+    [   '$log', '$rootScope', '$http',
+        'Store'
    ];
--- a/awx/ui/client/src/shared/smart-search/smart-search.controller.js
+++ b/awx/ui/client/src/shared/smart-search/smart-search.controller.js
@ -1,5 +1,5 @@
-export default ['$stateParams', '$scope', '$state', 'QuerySet', 'GetBasePath', 'QuerySet', 'SmartSearchService', 'i18n',
-    function($stateParams, $scope, $state, QuerySet, GetBasePath, qs, SmartSearchService, i18n) {
+export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', 'SmartSearchService', 'i18n',
+    function($stateParams, $scope, $state, GetBasePath, qs, SmartSearchService, i18n) {

        let path,
            defaults,
--- a/awx/ui/client/src/system-tracking/data-services/get-data-for-comparison.factory.js
+++ b/awx/ui/client/src/system-tracking/data-services/get-data-for-comparison.factory.js
@ -8,10 +8,9 @@ import dedupeVersions from './dedupe-versions';

 export default
    [   'factScanDataService',
-        'getModuleOptions',
        'resolveEmptyVersions',
        'lodashAsPromised',
-        function(factScanDataService, getModuleOptions, resolveEmptyVersions, _) {
+        function(factScanDataService, resolveEmptyVersions, _) {
            return function(hostIds, moduleName, leftDate, rightDate) {

                var singleHostMode = false;
--- a/awx/ui/client/src/system-tracking/system-tracking.controller.js
+++ b/awx/ui/client/src/system-tracking/system-tracking.controller.js
@ -9,8 +9,7 @@ import {compareFacts} from './compare-facts/main';
 import {formatFactForDisplay} from './format-facts';
 import FactTemplate from './compare-facts/fact-template';

-function controller($rootScope,
-                    $scope,
+function controller($scope,
                    $stateParams,
                    $location,
                    $q,
@ -321,8 +320,7 @@ function controller($rootScope,
 }

 export default
-    [   '$rootScope',
-        '$scope',
+    [   '$scope',
        '$stateParams',
        '$location',
        '$q',
--- a/awx/ui/client/src/teams/add/teams-add.controller.js
+++ b/awx/ui/client/src/teams/add/teams-add.controller.js
@ -4,9 +4,9 @@
 * All Rights Reserved
 *************************************************/

-export default ['$scope', '$rootScope', '$stateParams', 'TeamForm', 'GenerateForm',
+export default ['$scope', '$rootScope', 'TeamForm', 'GenerateForm',
    'Rest', 'Alert', 'ProcessErrors', 'ClearScope', 'GetBasePath', 'Wait', '$state',
-    function($scope, $rootScope, $stateParams, TeamForm, GenerateForm, Rest, Alert, ProcessErrors,
+    function($scope, $rootScope, TeamForm, GenerateForm, Rest, Alert, ProcessErrors,
        ClearScope, GetBasePath, Wait, $state) {

        ClearScope('htmlTemplate'); //Garbage collection. Don't leave behind any listeners/watchers from the prior
--- a/awx/ui/client/src/teams/list/teams-list.controller.js
+++ b/awx/ui/client/src/teams/list/teams-list.controller.js
@ -4,11 +4,11 @@
 * All Rights Reserved
 *************************************************/

-export default ['$scope', '$rootScope', '$log',
-    '$stateParams', 'Rest', 'Alert', 'TeamList', 'Prompt', 'ClearScope',
+export default ['$scope',
+    'Rest', 'TeamList', 'Prompt', 'ClearScope',
    'ProcessErrors', 'GetBasePath', 'Wait', '$state', '$filter', 'rbacUiControlService', 'Dataset',
-    function($scope, $rootScope, $log, $stateParams,
-    Rest, Alert, TeamList, Prompt, ClearScope, ProcessErrors,
+    function($scope,
+    Rest, TeamList, Prompt, ClearScope, ProcessErrors,
    GetBasePath, Wait, $state, $filter, rbacUiControlService, Dataset) {

        ClearScope();
--- a/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js
+++ b/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js
@ -5,16 +5,16 @@
 *************************************************/

 export default
-     [   '$filter', '$scope', '$rootScope', '$compile', '$location', '$log',
+     [   '$filter', '$scope',
        '$stateParams', 'JobTemplateForm', 'GenerateForm', 'Rest', 'Alert',
        'ProcessErrors', 'ClearScope', 'GetBasePath', 'md5Setup', 'ParseTypeChange', 'Wait',
-        'Empty', 'ToJSON', 'CallbackHelpInit', 'Prompt', 'GetChoices', '$state',
+        'Empty', 'ToJSON', 'CallbackHelpInit', 'GetChoices', '$state',
         'CreateSelect2', '$q', 'i18n',
         function(
-             $filter, $scope, $rootScope, $compile,
-             $location, $log, $stateParams, JobTemplateForm, GenerateForm, Rest, Alert,
+             $filter, $scope,
+             $stateParams, JobTemplateForm, GenerateForm, Rest, Alert,
             ProcessErrors, ClearScope, GetBasePath, md5Setup, ParseTypeChange, Wait,
-             Empty, ToJSON, CallbackHelpInit, Prompt, GetChoices,
+             Empty, ToJSON, CallbackHelpInit, GetChoices,
             $state, CreateSelect2, $q, i18n
         ) {

--- a/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
+++ b/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
@ -11,19 +11,19 @@
 */

 export default
-    [   '$filter', '$scope', '$rootScope', '$compile',
-        '$location', '$log', '$stateParams', 'JobTemplateForm', 'GenerateForm',
-        'Rest', 'Alert',  'ProcessErrors', 'ReturnToCaller', 'ClearScope', 'GetBasePath', 'md5Setup',
-        'ParseTypeChange', 'JobStatusToolTip', 'FormatDate', 'Wait',
-        'Empty', 'Prompt', 'ParseVariableString', 'ToJSON', 'GetChoices', 'CallbackHelpInit',
+    [   '$filter', '$scope', '$rootScope',
+        '$location', '$stateParams', 'JobTemplateForm', 'GenerateForm',
+        'Rest', 'Alert',  'ProcessErrors', 'ClearScope', 'GetBasePath', 'md5Setup',
+        'ParseTypeChange', 'Wait',
+        'Empty', 'Prompt', 'ToJSON', 'GetChoices', 'CallbackHelpInit',
        'InitiatePlaybookRun' , 'initSurvey', '$state', 'CreateSelect2',
        'ToggleNotification','$q',
        function(
-            $filter, $scope, $rootScope, $compile,
-            $location, $log, $stateParams, JobTemplateForm, GenerateForm, Rest, Alert,
-            ProcessErrors, ReturnToCaller, ClearScope, GetBasePath, md5Setup,
-            ParseTypeChange, JobStatusToolTip, FormatDate, Wait,
-            Empty, Prompt, ParseVariableString, ToJSON, GetChoices, CallbackHelpInit, InitiatePlaybookRun, SurveyControllerInit, $state,
+            $filter, $scope, $rootScope,
+            $location, $stateParams, JobTemplateForm, GenerateForm, Rest, Alert,
+            ProcessErrors, ClearScope, GetBasePath, md5Setup,
+            ParseTypeChange, Wait,
+            Empty, Prompt, ToJSON, GetChoices, CallbackHelpInit, InitiatePlaybookRun, SurveyControllerInit, $state,
            CreateSelect2, ToggleNotification, $q
        ) {

--- a/awx/ui/client/src/templates/job_templates/factories/callback-help-init.factory.js
+++ b/awx/ui/client/src/templates/job_templates/factories/callback-help-init.factory.js
@ -1,6 +1,6 @@
 export default
-    function CallbackHelpInit($location, GetBasePath, Rest, JobTemplateForm, GenerateForm, $stateParams, ProcessErrors, ParseTypeChange,
-             ParseVariableString, Empty, InventoryList, CredentialList, ProjectList, Wait) {
+    function CallbackHelpInit($location, GetBasePath, Rest, JobTemplateForm, GenerateForm, $stateParams, ProcessErrors,
+             ParseVariableString, Empty, CredentialList, Wait) {
        return function(params) {
            var scope = params.scope,
            defaultUrl = GetBasePath('job_templates'),
@ -151,6 +151,6 @@ export default

 CallbackHelpInit.$inject =
    [   '$location', 'GetBasePath', 'Rest', 'JobTemplateForm', 'GenerateForm',
-        '$stateParams', 'ProcessErrors', 'ParseTypeChange', 'ParseVariableString',
-        'Empty', 'InventoryList', 'CredentialList','ProjectList', 'Wait'
+        '$stateParams', 'ProcessErrors', 'ParseVariableString',
+        'Empty', 'CredentialList', 'Wait'
    ];
--- a/awx/ui/client/src/templates/list/templates-list.controller.js
+++ b/awx/ui/client/src/templates/list/templates-list.controller.js
@ -4,16 +4,16 @@
 * All Rights Reserved
 *************************************************/

-export default ['$scope', '$rootScope', '$location', '$stateParams', 'Rest',
+export default ['$scope', '$rootScope',
    'Alert','TemplateList', 'Prompt', 'ClearScope', 'ProcessErrors',
    'GetBasePath', 'InitiatePlaybookRun', 'Wait', '$state', '$filter',
    'Dataset', 'rbacUiControlService', 'TemplatesService','QuerySet',
-    'GetChoices', 'TemplateCopyService',
+    'TemplateCopyService',
    function(
-        $scope, $rootScope, $location, $stateParams, Rest, Alert,
+        $scope, $rootScope, Alert,
        TemplateList, Prompt, ClearScope, ProcessErrors, GetBasePath,
        InitiatePlaybookRun, Wait, $state, $filter, Dataset, rbacUiControlService, TemplatesService,
-        qs, GetChoices, TemplateCopyService
+        qs, TemplateCopyService
    ) {
        ClearScope();

--- a/awx/ui/client/src/templates/survey-maker/questions/edit.factory.js
+++ b/awx/ui/client/src/templates/survey-maker/questions/edit.factory.js
@ -1,5 +1,5 @@
 export default
-    function EditQuestion(GetBasePath, Rest, Wait, ProcessErrors, $compile, GenerateForm, SurveyQuestionForm, CreateSelect2) {
+    function EditQuestion(GenerateForm, CreateSelect2, SurveyQuestionForm) {
        return function(params) {

            var scope = params.scope,
@ -94,12 +94,7 @@ export default
    }

 EditQuestion.$inject =
-    [   'GetBasePath',
-        'Rest',
-        'Wait',
-        'ProcessErrors',
-        '$compile',
-        'GenerateForm',
-        'questionDefinitionForm',
-        'CreateSelect2'
+    [   'GenerateForm',
+        'CreateSelect2',
+        'questionDefinitionForm'
    ];
--- a/awx/ui/client/src/templates/survey-maker/surveys/add.factory.js
+++ b/awx/ui/client/src/templates/survey-maker/surveys/add.factory.js
@ -1,5 +1,5 @@
 export default
-    function AddFactory($location, $stateParams, ShowSurveyModal, Wait) {
+    function AddFactory(ShowSurveyModal, Wait) {
        return function(params) {
            var scope = params.scope;

@ -20,8 +20,6 @@ export default
    }

 AddFactory.$inject =
-    [   '$location',
-        '$stateParams',
-        'showSurvey',
+    [   'showSurvey',
        'Wait'
    ];
--- a/awx/ui/client/src/templates/survey-maker/surveys/init.factory.js
+++ b/awx/ui/client/src/templates/survey-maker/surveys/init.factory.js
@ -1,6 +1,6 @@
 export default
        function Init(DeleteSurvey, EditSurvey, AddSurvey, GenerateForm, SurveyQuestionForm, Wait, Alert,
-            GetBasePath, Rest, ProcessErrors, $compile, EditQuestion, CreateSelect2) {
+            GetBasePath, Rest, ProcessErrors, EditQuestion, CreateSelect2) {
        return function(params) {
            var scope = params.scope,
                id = params.id,
@ -525,7 +525,6 @@ Init.$inject =
        'GetBasePath',
        'Rest',
        'ProcessErrors',
-        '$compile',
        'editQuestion',
        'CreateSelect2'
    ];
--- a/awx/ui/client/src/templates/survey-maker/surveys/show.factory.js
+++ b/awx/ui/client/src/templates/survey-maker/surveys/show.factory.js
@ -1,5 +1,5 @@
 export default
-    function ShowFactory(Wait, CreateDialog, Empty, $compile) {
+    function ShowFactory(Wait, CreateDialog, $compile) {
        return function(params) {
            // Set modal dimensions based on viewport width

@ -47,6 +47,5 @@ export default
 ShowFactory.$inject =
    [   'Wait',
        'CreateDialog',
-        'Empty',
        '$compile'
    ];
--- a/awx/ui/client/src/templates/workflows/add-workflow/workflow-add.controller.js
+++ b/awx/ui/client/src/templates/workflows/add-workflow/workflow-add.controller.js
@ -7,11 +7,11 @@
 export default
 [   '$scope', 'WorkflowForm', 'GenerateForm', 'Alert', 'ProcessErrors', 'ClearScope',
     'Wait', '$state', 'CreateSelect2', 'TemplatesService', 'ToJSON',
-     'ParseTypeChange', 'OrganizationList', '$q', 'Rest', 'GetBasePath',
+     'ParseTypeChange', '$q', 'Rest', 'GetBasePath',
     function(
         $scope, WorkflowForm, GenerateForm, Alert, ProcessErrors, ClearScope,
         Wait, $state, CreateSelect2, TemplatesService, ToJSON,
-         ParseTypeChange, OrganizationList, $q, Rest, GetBasePath
+         ParseTypeChange, $q, Rest, GetBasePath
     ) {

         Rest.setUrl(GetBasePath('workflow_job_templates'));
--- a/awx/ui/client/src/templates/workflows/edit-workflow/workflow-edit.controller.js
+++ b/awx/ui/client/src/templates/workflows/edit-workflow/workflow-edit.controller.js
@ -8,12 +8,12 @@
 [   '$scope', '$stateParams', 'WorkflowForm', 'GenerateForm', 'Alert', 'ProcessErrors',
     'ClearScope', 'GetBasePath', '$q', 'ParseTypeChange', 'Wait', 'Empty',
     'ToJSON', 'initSurvey', '$state', 'CreateSelect2', 'ParseVariableString',
-     'TemplatesService', 'OrganizationList', 'Rest', 'WorkflowService', 'ToggleNotification',
+     'TemplatesService', 'Rest', 'ToggleNotification',
     function(
         $scope, $stateParams, WorkflowForm, GenerateForm, Alert, ProcessErrors,
         ClearScope, GetBasePath, $q, ParseTypeChange, Wait, Empty,
         ToJSON, SurveyControllerInit, $state, CreateSelect2, ParseVariableString,
-         TemplatesService, OrganizationList, Rest, WorkflowService, ToggleNotification
+         TemplatesService, Rest, ToggleNotification
     ) {

        ClearScope();
--- a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
+++ b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
@ -4,14 +4,14 @@
 * All Rights Reserved
 *************************************************/

-export default ['$scope', 'WorkflowService', 'generateList', 'TemplateList', 'ProjectList',
-    'GetBasePath', 'Wait', 'TemplatesService', '$state',
-    'ProcessErrors', 'InventorySourcesList', 'CreateSelect2', 'WorkflowMakerForm',
-    'GenerateForm', 'InventoryList', 'CredentialList', '$q',
-    function($scope, WorkflowService, GenerateList, TemplateList, ProjectList,
-        GetBasePath, Wait, TemplatesService, $state,
-        ProcessErrors, InventorySourcesList, CreateSelect2, WorkflowMakerForm,
-        GenerateForm, InventoryList, CredentialList, $q) {
+export default ['$scope', 'WorkflowService',
+    'GetBasePath', 'TemplatesService', '$state',
+    'ProcessErrors', 'CreateSelect2', 'WorkflowMakerForm',
+    '$q',
+    function($scope, WorkflowService,
+        GetBasePath, TemplatesService, $state,
+        ProcessErrors, CreateSelect2, WorkflowMakerForm,
+        $q) {

        let form = WorkflowMakerForm();

--- a/awx/ui/client/src/users/add/users-add.controller.js
+++ b/awx/ui/client/src/users/add/users-add.controller.js
@ -12,10 +12,10 @@ const user_type_options = [
 { type: 'system_administrator', label: N_('System Administrator') },
 ];

-export default ['$scope', '$rootScope', '$stateParams', 'UserForm', 'GenerateForm',
+export default ['$scope', '$rootScope', 'UserForm', 'GenerateForm',
    'Rest', 'Alert', 'ProcessErrors', 'ReturnToCaller', 'ClearScope', 'GetBasePath',
    'Wait', 'CreateSelect2', '$state', '$location', 'i18n',
-    function($scope, $rootScope, $stateParams, UserForm,
+    function($scope, $rootScope, UserForm,
    GenerateForm, Rest, Alert, ProcessErrors, ReturnToCaller, ClearScope,
    GetBasePath, Wait, CreateSelect2, $state, $location, i18n) {

--- a/awx/ui/client/src/users/edit/users-edit.controller.js
+++ b/awx/ui/client/src/users/edit/users-edit.controller.js
@ -12,10 +12,10 @@ const user_type_options = [
 { type: 'system_administrator', label: N_('System Administrator') },
 ];

-export default ['$scope', '$rootScope', '$location',
+export default ['$scope', '$rootScope',
    '$stateParams', 'UserForm', 'Rest', 'ProcessErrors', 'ClearScope', 'GetBasePath',
    'Wait', 'CreateSelect2', '$state', 'i18n',
-    function($scope, $rootScope, $location,
+    function($scope, $rootScope,
    $stateParams, UserForm, Rest, ProcessErrors,
    ClearScope, GetBasePath, Wait, CreateSelect2, $state, i18n) {

--- a/awx/ui/client/src/users/list/users-list.controller.js
+++ b/awx/ui/client/src/users/list/users-list.controller.js
@ -12,11 +12,11 @@ const user_type_options = [
 { type: 'system_administrator', label: N_('System Administrator') },
 ];

-export default ['$scope', '$rootScope', '$stateParams',
-    'Rest', 'Alert', 'UserList', 'Prompt', 'ClearScope', 'ProcessErrors', 'GetBasePath',
+export default ['$scope', '$rootScope',
+    'Rest', 'UserList', 'Prompt', 'ClearScope', 'ProcessErrors', 'GetBasePath',
    'Wait', '$state', '$filter', 'rbacUiControlService', 'Dataset', 'i18n',
-    function($scope, $rootScope, $stateParams,
-    Rest, Alert, UserList, Prompt, ClearScope, ProcessErrors, GetBasePath,
+    function($scope, $rootScope,
+    Rest, UserList, Prompt, ClearScope, ProcessErrors, GetBasePath,
    Wait, $state, $filter, rbacUiControlService, Dataset, i18n) {

        for (var i = 0; i < user_type_options.length; i++) {