diff --git a/awx/ui/client/src/adhoc/adhoc.route.js b/awx/ui/client/src/adhoc/adhoc.route.js
index 5e7b47a850..c10d565c72 100644
--- a/awx/ui/client/src/adhoc/adhoc.route.js
+++ b/awx/ui/client/src/adhoc/adhoc.route.js
@@ -10,10 +10,5 @@ export default {
     route: '/adhoc',
     name: 'inventoryManage.adhoc',
     templateUrl: templateUrl('adhoc/adhoc'),
-    controller: 'adhocController',
-    resolve: {
-        features: ['FeaturesService', function(FeaturesService) {
-            return FeaturesService.get();
-        }]
-    }
+    controller: 'adhocController'
 };
diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js
index b3a2802df3..d57b217fee 100644
--- a/awx/ui/client/src/app.js
+++ b/awx/ui/client/src/app.js
@@ -258,11 +258,6 @@ var tower = angular.module('Tower', [
                 ncyBreadcrumb: {
                     parent: 'dashboard',
                     label: "GROUPS"
-                },
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
                 }
             }).
 
@@ -272,11 +267,6 @@ var tower = angular.module('Tower', [
                 controller: JobsListController,
                 ncyBreadcrumb: {
                     label: "JOBS"
-                },
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
                 }
             }).
 
@@ -290,11 +280,6 @@ var tower = angular.module('Tower', [
                 },
                 ncyBreadcrumb: {
                     label: "PROJECTS"
-                },
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
                 }
             }).
 
@@ -305,11 +290,6 @@ var tower = angular.module('Tower', [
                 ncyBreadcrumb: {
                     parent: "projects",
                     label: "CREATE PROJECT"
-                },
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
                 }
             }).
 
@@ -319,77 +299,42 @@ var tower = angular.module('Tower', [
                 controller: ProjectsEdit,
                 data: {
                     activityStreamId: 'id'
-                },
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
                 }
             }).
             state('projectOrganizations', {
                 url: '/projects/:project_id/organizations',
                 templateUrl: urlPrefix + 'partials/projects.html',
-                controller: OrganizationsList,
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
-                }
+                controller: OrganizationsList
             }).
 
             state('projectOrganizationAdd', {
                 url: '/projects/:project_id/organizations/add',
                 templateUrl: urlPrefix + 'partials/projects.html',
-                controller: OrganizationsAdd,
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
-                }
+                controller: OrganizationsAdd
             }).
 
             state('organizationAdmins', {
                 url: '/organizations/:organization_id/admins',
                 templateUrl: urlPrefix + 'partials/organizations.html',
-                controller: AdminsList,
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
-                }
+                controller: AdminsList
             }).
 
             state('organizationUsers', {
                 url:'/organizations/:organization_id/users',
                 templateUrl: urlPrefix + 'partials/users.html',
-                controller: UsersList,
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
-                }
+                controller: UsersList
             }).
 
             state('organizationUserAdd', {
                 url: '/organizations/:organization_id/users/add',
                 templateUrl: urlPrefix + 'partials/users.html',
-                controller: UsersAdd,
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
-                }
+                controller: UsersAdd
             }).
 
             state('organizationUserEdit', {
                 url: '/organizations/:organization_id/users/:user_id',
                 templateUrl: urlPrefix + 'partials/users.html',
-                controller: UsersEdit,
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
-                }
+                controller: UsersEdit
             }).
 
             state('teams', {
@@ -403,11 +348,6 @@ var tower = angular.module('Tower', [
                 ncyBreadcrumb: {
                     parent: 'setup',
                     label: 'TEAMS'
-                },
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
                 }
             }).
 
@@ -418,11 +358,6 @@ var tower = angular.module('Tower', [
                 ncyBreadcrumb: {
                     parent: "teams",
                     label: "CREATE TEAM"
-                },
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
                 }
             }).
 
@@ -432,100 +367,55 @@ var tower = angular.module('Tower', [
                 controller: TeamsEdit,
                 data: {
                     activityStreamId: 'team_id'
-                },
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
                 }
             }).
 
             state('teamUsers', {
                 url: '/teams/:team_id/users',
                 templateUrl: urlPrefix + 'partials/teams.html',
-                controller: UsersList,
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
-                }
+                controller: UsersList
             }).
 
             state('teamUserEdit', {
                 url: '/teams/:team_id/users/:user_id',
                 templateUrl: urlPrefix + 'partials/teams.html',
-                controller: UsersEdit,
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
-                }
+                controller: UsersEdit
             }).
 
             state('teamProjects', {
                 url: '/teams/:team_id/projects',
                 templateUrl: urlPrefix + 'partials/teams.html',
-                controller: ProjectsList,
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
-                }
+                controller: ProjectsList
             }).
 
             state('teamProjectAdd', {
                 url: '/teams/:team_id/projects/add',
                 templateUrl: urlPrefix + 'partials/teams.html',
-                controller: ProjectsAdd,
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
-                }
+                controller: ProjectsAdd
             }).
 
             state('teamProjectEdit', {
                 url: '/teams/:team_id/projects/:project_id',
                 templateUrl: urlPrefix + 'partials/teams.html',
-                controller: ProjectsEdit,
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
-                }
+                controller: ProjectsEdit
             }).
 
             state('teamCredentials', {
                 url: '/teams/:team_id/credentials',
                 templateUrl: urlPrefix + 'partials/teams.html',
-                controller: CredentialsList,
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
-                }
+                controller: CredentialsList
             }).
 
             state('teamCredentialAdd', {
                 url: '/teams/:team_id/credentials/add',
                 templateUrl: urlPrefix + 'partials/teams.html',
-                controller: CredentialsAdd,
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
-                }
+                controller: CredentialsAdd
             }).
 
             state('teamCredentialEdit', {
                 url: '/teams/:team_id/credentials/:credential_id',
                 templateUrl: urlPrefix + 'partials/teams.html',
-                controller: CredentialsEdit,
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
-                }
+                controller: CredentialsEdit
             }).
 
             state('credentials', {
@@ -539,11 +429,6 @@ var tower = angular.module('Tower', [
                 ncyBreadcrumb: {
                     parent: 'setup',
                     label: 'CREDENTIALS'
-                },
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
                 }
             }).
 
@@ -554,11 +439,6 @@ var tower = angular.module('Tower', [
                 ncyBreadcrumb: {
                     parent: "credentials",
                     label: "CREATE CREDENTIAL"
-                },
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
                 }
             }).
 
@@ -568,11 +448,6 @@ var tower = angular.module('Tower', [
                 controller: CredentialsEdit,
                 data: {
                     activityStreamId: 'credential_id'
-                },
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
                 }
             }).
 
@@ -587,11 +462,6 @@ var tower = angular.module('Tower', [
                 ncyBreadcrumb: {
                     parent: 'setup',
                     label: 'USERS'
-                },
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
                 }
             }).
 
@@ -602,11 +472,6 @@ var tower = angular.module('Tower', [
                 ncyBreadcrumb: {
                     parent: "users",
                     label: "CREATE USER"
-                },
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
                 }
             }).
 
@@ -616,45 +481,25 @@ var tower = angular.module('Tower', [
                 controller: UsersEdit,
                 data: {
                     activityStreamId: 'user_id'
-                },
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
                 }
             }).
 
             state('userCredentials', {
                 url: '/users/:user_id/credentials',
                 templateUrl: urlPrefix + 'partials/users.html',
-                controller: CredentialsList,
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
-                }
+                controller: CredentialsList
             }).
 
             state('userCredentialAdd', {
                 url: '/users/:user_id/credentials/add',
                 templateUrl: urlPrefix + 'partials/teams.html',
-                controller: CredentialsAdd,
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
-                }
+                controller: CredentialsAdd
             }).
 
             state('teamUserCredentialEdit', {
                 url: '/teams/:user_id/credentials/:credential_id',
                 templateUrl: urlPrefix + 'partials/teams.html',
-                controller: CredentialsEdit,
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
-                }
+                controller: CredentialsEdit
             }).
 
             state('sockets', {
diff --git a/awx/ui/client/src/inventories/add/inventory-add.route.js b/awx/ui/client/src/inventories/add/inventory-add.route.js
index 50ba5b26a6..18b3becc71 100644
--- a/awx/ui/client/src/inventories/add/inventory-add.route.js
+++ b/awx/ui/client/src/inventories/add/inventory-add.route.js
@@ -15,10 +15,5 @@ export default {
     ncyBreadcrumb: {
         parent: "inventories",
         label: "CREATE INVENTORY"
-    },
-    resolve: {
-        features: ['FeaturesService', function(FeaturesService) {
-            return FeaturesService.get();
-        }]
     }
 };
diff --git a/awx/ui/client/src/inventories/list/inventory-list.route.js b/awx/ui/client/src/inventories/list/inventory-list.route.js
index 2804370249..65709dd512 100644
--- a/awx/ui/client/src/inventories/list/inventory-list.route.js
+++ b/awx/ui/client/src/inventories/list/inventory-list.route.js
@@ -18,10 +18,5 @@ export default {
     },
     ncyBreadcrumb: {
         label: "INVENTORIES"
-    },
-    resolve: {
-        features: ['FeaturesService', function(FeaturesService) {
-            return FeaturesService.get();
-        }]
     }
 };
diff --git a/awx/ui/client/src/inventories/manage/copy/copy.route.js b/awx/ui/client/src/inventories/manage/copy/copy.route.js
index abd0e3a00e..360cc30edc 100644
--- a/awx/ui/client/src/inventories/manage/copy/copy.route.js
+++ b/awx/ui/client/src/inventories/manage/copy/copy.route.js
@@ -19,11 +19,6 @@ export default {
         ncyBreadcrumb: {
             label: "COPY"
         },
-        resolve: {
-            features: ['FeaturesService', function(FeaturesService) {
-                return FeaturesService.get();
-            }],
-        },
         controller: inventoryManageCopyCtrl,
         controllerAs: 'vm',
         bindToController: true,
diff --git a/awx/ui/client/src/inventories/manage/inventory-manage.route.js b/awx/ui/client/src/inventories/manage/inventory-manage.route.js
index 62306cd91b..674297bb0a 100644
--- a/awx/ui/client/src/inventories/manage/inventory-manage.route.js
+++ b/awx/ui/client/src/inventories/manage/inventory-manage.route.js
@@ -19,10 +19,5 @@ export default {
     },
     ncyBreadcrumb: {
         label: "INVENTORY MANAGE"
-    },
-    resolve: {
-        features: ['FeaturesService', function(FeaturesService) {
-            return FeaturesService.get();
-        }]
     }
 };
diff --git a/awx/ui/client/src/inventories/manage/manage-groups/manage-groups.route.js b/awx/ui/client/src/inventories/manage/manage-groups/manage-groups.route.js
index e83c934ea9..8fb8b16952 100644
--- a/awx/ui/client/src/inventories/manage/manage-groups/manage-groups.route.js
+++ b/awx/ui/client/src/inventories/manage/manage-groups/manage-groups.route.js
@@ -18,11 +18,6 @@ export default {
         },
         ncyBreadcrumb: {
             label: "INVENTORY EDIT GROUPS"
-        },
-        resolve: {
-            features: ['FeaturesService', function(FeaturesService) {
-                return FeaturesService.get();
-            }]
         }
     },
 
@@ -35,11 +30,6 @@ export default {
         },
         data: {
             mode: 'add'
-        },
-        resolve: {
-            features: ['FeaturesService', function(FeaturesService) {
-                return FeaturesService.get();
-            }]
         }
     },
 
diff --git a/awx/ui/client/src/inventories/manage/manage-hosts/manage-hosts.route.js b/awx/ui/client/src/inventories/manage/manage-hosts/manage-hosts.route.js
index 670652c1c7..bf349a9e1c 100644
--- a/awx/ui/client/src/inventories/manage/manage-hosts/manage-hosts.route.js
+++ b/awx/ui/client/src/inventories/manage/manage-hosts/manage-hosts.route.js
@@ -19,15 +19,12 @@ var ManageHostsEdit = {
         mode: 'edit'
     },
     resolve: {
-        features: ['FeaturesService', function(FeaturesService) {
-            return FeaturesService.get();
-        }],
         host: ['$stateParams', 'ManageHostsService', function($stateParams, ManageHostsService){
             return ManageHostsService.get({id: $stateParams.host_id}).then(function(res){
                 return res.data.results[0];
             });
         }]
-    }    
+    }
 };
 var ManageHostsAdd = {
     name: 'inventoryManage.addHost',
@@ -39,11 +36,6 @@ var ManageHostsAdd = {
     },
     data: {
         mode: 'add'
-    },
-    resolve: {
-        features: ['FeaturesService', function(FeaturesService) {
-            return FeaturesService.get();
-        }]
     }
 };
 export {ManageHostsAdd, ManageHostsEdit};
diff --git a/awx/ui/client/src/inventory-scripts/add/add.route.js b/awx/ui/client/src/inventory-scripts/add/add.route.js
index 8eb1e27bc9..413fa9819a 100644
--- a/awx/ui/client/src/inventory-scripts/add/add.route.js
+++ b/awx/ui/client/src/inventory-scripts/add/add.route.js
@@ -11,11 +11,6 @@ export default {
     route: '/add',
     templateUrl: templateUrl('inventory-scripts/add/add'),
     controller: 'inventoryScriptsAddController',
-    resolve: {
-        features: ['FeaturesService', function(FeaturesService) {
-            return FeaturesService.get();
-        }]
-    },
     ncyBreadcrumb: {
         parent: 'inventoryScripts',
         label: 'CREATE INVENTORY SCRIPT'
diff --git a/awx/ui/client/src/inventory-scripts/edit/edit.route.js b/awx/ui/client/src/inventory-scripts/edit/edit.route.js
index fbd10b2513..7acc9c6c05 100644
--- a/awx/ui/client/src/inventory-scripts/edit/edit.route.js
+++ b/awx/ui/client/src/inventory-scripts/edit/edit.route.js
@@ -13,9 +13,6 @@ export default {
     controller: 'inventoryScriptsEditController',
     params: {inventory_script: null},
     resolve: {
-        features: ['FeaturesService', function(FeaturesService) {
-            return FeaturesService.get();
-        }],
         inventory_script:
         [   '$state',
             '$stateParams',
diff --git a/awx/ui/client/src/inventory-scripts/list/list.route.js b/awx/ui/client/src/inventory-scripts/list/list.route.js
index 6557534d3c..313700703c 100644
--- a/awx/ui/client/src/inventory-scripts/list/list.route.js
+++ b/awx/ui/client/src/inventory-scripts/list/list.route.js
@@ -15,11 +15,6 @@ export default {
         activityStream: true,
         activityStreamTarget: 'inventory_script'
     },
-    resolve: {
-        features: ['FeaturesService', function(FeaturesService) {
-            return FeaturesService.get();
-        }]
-    },
     ncyBreadcrumb: {
         parent: 'setup',
         label: 'INVENTORY SCRIPTS'
diff --git a/awx/ui/client/src/job-detail/host-event/host-event.route.js b/awx/ui/client/src/job-detail/host-event/host-event.route.js
index d435b00f90..534618187e 100644
--- a/awx/ui/client/src/job-detail/host-event/host-event.route.js
+++ b/awx/ui/client/src/job-detail/host-event/host-event.route.js
@@ -12,9 +12,6 @@ var hostEventModal = {
  	controller: 'HostEventController',
  	templateUrl: templateUrl('job-detail/host-event/host-event-modal'),
  	resolve: {
- 		features: ['FeaturesService', function(FeaturesService){
- 			return FeaturesService.get();
- 		}],
         event: ['JobDetailService','$stateParams', function(JobDetailService, $stateParams) {
              return JobDetailService.getRelatedJobEvents($stateParams.id, {
  				id: $stateParams.eventId
diff --git a/awx/ui/client/src/job-detail/host-events/host-events.route.js b/awx/ui/client/src/job-detail/host-events/host-events.route.js
index a42e5c5d5d..bf983b8f00 100644
--- a/awx/ui/client/src/job-detail/host-events/host-events.route.js
+++ b/awx/ui/client/src/job-detail/host-events/host-events.route.js
@@ -23,9 +23,6 @@ export default {
         $('body').removeClass('modal-open');
     },
     resolve: {
-        features: ['FeaturesService', function(FeaturesService) {
-            return FeaturesService.get();
-        }],
         hosts: ['JobDetailService','$stateParams', function(JobDetailService, $stateParams) {
              return JobDetailService.getRelatedJobEvents($stateParams.id, {
                 host_name: $stateParams.hostName
diff --git a/awx/ui/client/src/job-detail/job-detail.route.js b/awx/ui/client/src/job-detail/job-detail.route.js
index a3e7f124cb..926b8f7306 100644
--- a/awx/ui/client/src/job-detail/job-detail.route.js
+++ b/awx/ui/client/src/job-detail/job-detail.route.js
@@ -14,9 +14,6 @@ export default {
         label: "{{ job.id }} - {{ job.name }}"
     },
     resolve: {
-        features: ['FeaturesService', function(FeaturesService) {
-            return FeaturesService.get();
-        }],
         jobEventsSocket: ['Socket', '$rootScope', function(Socket, $rootScope) {
             if (!$rootScope.event_socket) {
                 $rootScope.event_socket = Socket({
diff --git a/awx/ui/client/src/job-templates/add/inventory-job-templates-add.route.js b/awx/ui/client/src/job-templates/add/inventory-job-templates-add.route.js
index c273fcbbf3..329d537e6b 100644
--- a/awx/ui/client/src/job-templates/add/inventory-job-templates-add.route.js
+++ b/awx/ui/client/src/job-templates/add/inventory-job-templates-add.route.js
@@ -10,10 +10,5 @@ export default {
     name: 'inventoryJobTemplateAdd',
     url: '/inventories/:inventory_id/job_templates/add',
     templateUrl: templateUrl('job-templates/add/job-templates-add'),
-    controller: 'JobTemplatesAdd',
-    resolve: {
-        features: ['FeaturesService', function(FeaturesService) {
-            return FeaturesService.get();
-        }]
-    }
+    controller: 'JobTemplatesAdd'
 };
diff --git a/awx/ui/client/src/job-templates/add/job-templates-add.route.js b/awx/ui/client/src/job-templates/add/job-templates-add.route.js
index 7d79f00763..d9f9a5c9d3 100644
--- a/awx/ui/client/src/job-templates/add/job-templates-add.route.js
+++ b/awx/ui/client/src/job-templates/add/job-templates-add.route.js
@@ -14,10 +14,5 @@ export default {
     ncyBreadcrumb: {
         parent: "jobTemplates",
         label: "CREATE JOB TEMPLATE"
-    },
-    resolve: {
-        features: ['FeaturesService', function(FeaturesService) {
-            return FeaturesService.get();
-        }]
     }
 };
diff --git a/awx/ui/client/src/job-templates/edit/inventory-job-templates-edit.route.js b/awx/ui/client/src/job-templates/edit/inventory-job-templates-edit.route.js
index 6b0d476302..a0b383c999 100644
--- a/awx/ui/client/src/job-templates/edit/inventory-job-templates-edit.route.js
+++ b/awx/ui/client/src/job-templates/edit/inventory-job-templates-edit.route.js
@@ -13,10 +13,5 @@ export default {
     controller: 'JobTemplatesEdit',
     data: {
         activityStreamId: 'template_id'
-    },
-    resolve: {
-        features: ['FeaturesService', function(FeaturesService) {
-            return FeaturesService.get();
-        }]
     }
 };
diff --git a/awx/ui/client/src/job-templates/edit/job-templates-edit.route.js b/awx/ui/client/src/job-templates/edit/job-templates-edit.route.js
index bff528f567..f4905af2ca 100644
--- a/awx/ui/client/src/job-templates/edit/job-templates-edit.route.js
+++ b/awx/ui/client/src/job-templates/edit/job-templates-edit.route.js
@@ -14,11 +14,6 @@ export default {
     data: {
         activityStreamId: 'template_id'
     },
-    resolve: {
-        features: ['FeaturesService', function(FeaturesService) {
-            return FeaturesService.get();
-        }]
-    },
     params: {
         copied: null
     }
diff --git a/awx/ui/client/src/management-jobs/card/card.route.js b/awx/ui/client/src/management-jobs/card/card.route.js
index 7f177b9b5a..90bbebde81 100644
--- a/awx/ui/client/src/management-jobs/card/card.route.js
+++ b/awx/ui/client/src/management-jobs/card/card.route.js
@@ -15,11 +15,6 @@ export default {
         activityStream: true,
         activityStreamTarget: 'management_job'
     },
-    resolve: {
-        features: ['FeaturesService', function(FeaturesService) {
-            return FeaturesService.get();
-        }]
-    },
     ncyBreadcrumb: {
         parent: 'setup',
         label: 'MANAGEMENT JOBS'
diff --git a/awx/ui/client/src/management-jobs/notifications/notification.route.js b/awx/ui/client/src/management-jobs/notifications/notification.route.js
index d39e96ee20..6b28c615fa 100644
--- a/awx/ui/client/src/management-jobs/notifications/notification.route.js
+++ b/awx/ui/client/src/management-jobs/notifications/notification.route.js
@@ -13,9 +13,6 @@ export default {
     controller: 'managementJobsNotificationsController',
     params: {card: null},
     resolve: {
-        features: ['FeaturesService', function(FeaturesService) {
-            return FeaturesService.get();
-        }],
         management_job:
         [   '$stateParams',
             '$q',
diff --git a/awx/ui/client/src/management-jobs/scheduler/main.js b/awx/ui/client/src/management-jobs/scheduler/main.js
index 4a9bc10217..cebf19f2a4 100644
--- a/awx/ui/client/src/management-jobs/scheduler/main.js
+++ b/awx/ui/client/src/management-jobs/scheduler/main.js
@@ -20,33 +20,18 @@ export default
                 name: 'managementJobSchedules',
                 route: '/management_jobs/:id/schedules',
                 templateUrl: templateUrl('scheduler/scheduler'),
-                controller: 'managementJobController',
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService){
-                        return FeaturesService.get();
-                    }]
-                }
+                controller: 'managementJobController'
             });
             $stateExtender.addState({
                 name: 'managementJobSchedules.add',
                 route: '/add',
                 templateUrl: templateUrl('management-jobs/scheduler/schedulerForm'),
-                controller: 'managementJobAddController',
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService){
-                        return FeaturesService.get();
-                    }]
-                } 
+                controller: 'managementJobAddController'
             });
             $stateExtender.addState({
                 name: 'managementJobSchedules.edit',
                 route: '/edit/:schedule_id',
                 templateUrl: templateUrl('management-jobs/scheduler/schedulerForm'),
-                controller: 'managementJobEditController',
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService){
-                        return FeaturesService.get();
-                    }]
-                } 
+                controller: 'managementJobEditController'
             });
-        }]);
\ No newline at end of file
+        }]);
diff --git a/awx/ui/client/src/notifications/edit/edit.route.js b/awx/ui/client/src/notifications/edit/edit.route.js
index 1e1228c4c2..7c2954f7d3 100644
--- a/awx/ui/client/src/notifications/edit/edit.route.js
+++ b/awx/ui/client/src/notifications/edit/edit.route.js
@@ -12,9 +12,6 @@ export default {
     templateUrl: templateUrl('notifications/edit/edit'),
     controller: 'notificationsEditController',
     resolve: {
-        features: ['FeaturesService', function(FeaturesService) {
-            return FeaturesService.get();
-        }],
         notifier:
         [   '$state',
             '$stateParams',
diff --git a/awx/ui/client/src/notifications/notification-templates-list/list.route.js b/awx/ui/client/src/notifications/notification-templates-list/list.route.js
index e783b1e2f1..48678df468 100644
--- a/awx/ui/client/src/notifications/notification-templates-list/list.route.js
+++ b/awx/ui/client/src/notifications/notification-templates-list/list.route.js
@@ -10,10 +10,5 @@ export default {
     name: 'notifications',
     route: '/notifications',
     templateUrl: templateUrl('notifications/notification-templates-list/list'),
-    controller: 'notificationTemplatesListController',
-    resolve: {
-        features: ['FeaturesService', function(FeaturesService) {
-            return FeaturesService.get();
-        }]
-    }
+    controller: 'notificationTemplatesListController'
 };
diff --git a/awx/ui/client/src/organizations/edit/organizations-edit.route.js b/awx/ui/client/src/organizations/edit/organizations-edit.route.js
index ad546e71cc..be90b6b282 100644
--- a/awx/ui/client/src/organizations/edit/organizations-edit.route.js
+++ b/awx/ui/client/src/organizations/edit/organizations-edit.route.js
@@ -20,10 +20,5 @@ export default {
     ncyBreadcrumb: {
         parent: "organizations",
         label: "{{name}}"
-    },
-    resolve: {
-        features: ['FeaturesService', function(FeaturesService) {
-            return FeaturesService.get();
-        }]
     }
 };
diff --git a/awx/ui/client/src/organizations/list/organizations-list.route.js b/awx/ui/client/src/organizations/list/organizations-list.route.js
index a97b939c01..c99604eecb 100644
--- a/awx/ui/client/src/organizations/list/organizations-list.route.js
+++ b/awx/ui/client/src/organizations/list/organizations-list.route.js
@@ -22,10 +22,5 @@ export default {
             return "setup";
         },
         label: "ORGANIZATIONS"
-    },
-    resolve: {
-        features: ['FeaturesService', function(FeaturesService) {
-            return FeaturesService.get();
-        }]
     }
 };
diff --git a/awx/ui/client/src/permissions/add/team-add.route.js b/awx/ui/client/src/permissions/add/team-add.route.js
index ecf1022a8f..4eaba7b54a 100644
--- a/awx/ui/client/src/permissions/add/team-add.route.js
+++ b/awx/ui/client/src/permissions/add/team-add.route.js
@@ -10,10 +10,5 @@ export default {
     name: 'teamPermissionsAdd',
     route: '/teams/:team_id/permissions/add',
     templateUrl: templateUrl('permissions/shared/team-permissions'),
-    controller: 'permissionsAddController',
-    resolve: {
-        features: ['FeaturesService', function(FeaturesService) {
-            return FeaturesService.get();
-        }]
-    }
+    controller: 'permissionsAddController'
 };
diff --git a/awx/ui/client/src/permissions/edit/team-edit.route.js b/awx/ui/client/src/permissions/edit/team-edit.route.js
index 8122b7fcf5..d33c0a92fd 100644
--- a/awx/ui/client/src/permissions/edit/team-edit.route.js
+++ b/awx/ui/client/src/permissions/edit/team-edit.route.js
@@ -10,10 +10,5 @@ export default {
     name: 'teamPermissionsEdit',
     route: '/teams/:team_id/permissions/:permission_id',
     templateUrl: templateUrl('permissions/shared/team-permissions'),
-    controller: 'permissionsEditController',
-    resolve: {
-        features: ['FeaturesService', function(FeaturesService) {
-            return FeaturesService.get();
-        }]
-    }
+    controller: 'permissionsEditController'
 };
diff --git a/awx/ui/client/src/permissions/list/team-list.route.js b/awx/ui/client/src/permissions/list/team-list.route.js
index bd93ebf2e5..dce6b0c033 100644
--- a/awx/ui/client/src/permissions/list/team-list.route.js
+++ b/awx/ui/client/src/permissions/list/team-list.route.js
@@ -10,10 +10,5 @@ export default {
     name: 'teamPermissionsList',
     route: '/teams/:team_id/permissions',
     templateUrl: templateUrl('permissions/shared/team-permissions'),
-    controller: 'permissionsListController',
-    resolve: {
-        features: ['FeaturesService', function(FeaturesService) {
-            return FeaturesService.get();
-        }]
-    }
+    controller: 'permissionsListController'
 };
diff --git a/awx/ui/client/src/permissions/list/user-list.route.js b/awx/ui/client/src/permissions/list/user-list.route.js
index 586b000d69..f9b505c111 100644
--- a/awx/ui/client/src/permissions/list/user-list.route.js
+++ b/awx/ui/client/src/permissions/list/user-list.route.js
@@ -10,10 +10,5 @@ export default {
     name: 'userPermissionsList',
     route: '/users/:user_id/permissions',
     templateUrl: templateUrl('permissions/shared/user-permissions'),
-    controller: 'permissionsListController',
-    resolve: {
-        features: ['FeaturesService', function(FeaturesService) {
-            return FeaturesService.get();
-        }]
-    }
+    controller: 'permissionsListController'
 };
diff --git a/awx/ui/client/src/scheduler/main.js b/awx/ui/client/src/scheduler/main.js
index 812eef5479..b75ee987b9 100644
--- a/awx/ui/client/src/scheduler/main.js
+++ b/awx/ui/client/src/scheduler/main.js
@@ -19,99 +19,54 @@ export default
                 name: 'jobTemplateSchedules',
                 route: '/job_templates/:id/schedules',
                 templateUrl: templateUrl("scheduler/scheduler"),
-                controller: 'schedulerController',
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
-                }
+                controller: 'schedulerController'
             });
             $stateExtender.addState({
                 name: 'jobTemplateSchedules.add',
                 route: '/add',
                 templateUrl: templateUrl("scheduler/schedulerForm"),
-                controller: 'schedulerAddController',
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
-                }
+                controller: 'schedulerAddController'
             });
             $stateExtender.addState({
                 name: 'jobTemplateSchedules.edit',
                 route: '/:schedule_id',
                 templateUrl: templateUrl("scheduler/schedulerForm"),
-                controller: 'schedulerEditController',
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
-                }
+                controller: 'schedulerEditController'
             });
             $stateExtender.addState({
                 name: 'projectSchedules',
                 route: '/projects/:id/schedules',
                 templateUrl: templateUrl("scheduler/scheduler"),
-                controller: 'schedulerController',
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
-                }
+                controller: 'schedulerController'
             });
             $stateExtender.addState({
                 name: 'projectSchedules.add',
                 route: '/add',
                 templateUrl: templateUrl("scheduler/schedulerForm"),
-                controller: 'schedulerAddController',
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
-                }
+                controller: 'schedulerAddController'
             });
             $stateExtender.addState({
                 name: 'projectSchedules.edit',
                 route: '/:schedule_id',
                 templateUrl: templateUrl("scheduler/schedulerForm"),
-                controller: 'schedulerEditController',
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
-                }
+                controller: 'schedulerEditController'
             });
             $stateExtender.addState({
                 name: 'inventoryManageSchedules',
                 route: '/inventory/:inventory_id/manage/:id/schedules',
                 templateUrl: templateUrl("scheduler/scheduler"),
-                controller: 'schedulerController',
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
-                }
+                controller: 'schedulerController'
             });
             $stateExtender.addState({
                 name: 'inventoryManageSchedules.add',
                 route: '/add',
                 templateUrl: templateUrl("scheduler/schedulerForm"),
-                controller: 'schedulerAddController',
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
-                }
+                controller: 'schedulerAddController'
             });
             $stateExtender.addState({
                 name: 'inventoryManageSchedules.edit',
                 route: '/:schedule_id',
                 templateUrl: templateUrl("scheduler/schedulerForm"),
-                controller: 'schedulerEditController',
-                resolve: {
-                    features: ['FeaturesService', function(FeaturesService) {
-                        return FeaturesService.get();
-                    }]
-                }
+                controller: 'schedulerEditController'
             });
         }]);
diff --git a/awx/ui/client/src/shared/stateExtender.provider.js b/awx/ui/client/src/shared/stateExtender.provider.js
index 140ed06d4a..a2d4998754 100644
--- a/awx/ui/client/src/shared/stateExtender.provider.js
+++ b/awx/ui/client/src/shared/stateExtender.provider.js
@@ -1,13 +1,29 @@
 export default function($stateProvider) {
     this.$get = function() {
         return {
+            getResolves: function(state){
+                var resolve = state.resolve || {},
+                routes = ["login", "logout", "socket"];
+                if(_.indexOf(routes, state.name)>-1){
+                    return;
+                }
+                else{
+                    resolve.features = ['FeaturesService', function(FeaturesService) {
+                            return FeaturesService.get();
+                        }];
+                    return resolve;
+                }
+            },
+            
             addState: function(state) {
-                var route = state.route || state.url;
+                var route = state.route || state.url,
+                resolve = this.getResolves(state);
+
                 $stateProvider.state(state.name, {
                     url: route,
                     controller: state.controller,
                     templateUrl: state.templateUrl,
-                    resolve: state.resolve,
+                    resolve: resolve,
                     params: state.params,
                     data: state.data,
                     ncyBreadcrumb: state.ncyBreadcrumb,
diff --git a/awx/ui/client/src/standard-out/adhoc/standard-out-adhoc.route.js b/awx/ui/client/src/standard-out/adhoc/standard-out-adhoc.route.js
index 0b6f547359..f878ef02f8 100644
--- a/awx/ui/client/src/standard-out/adhoc/standard-out-adhoc.route.js
+++ b/awx/ui/client/src/standard-out/adhoc/standard-out-adhoc.route.js
@@ -19,9 +19,6 @@ export default {
         jobType: 'ad_hoc_commands'
     },
     resolve: {
-        features: ['FeaturesService', function(FeaturesService) {
-            return FeaturesService.get();
-        }],
         adhocEventsSocket: ['Socket', '$rootScope', function(Socket, $rootScope) {
             if (!$rootScope.adhoc_event_socket) {
                 $rootScope.adhoc_event_socket = Socket({
diff --git a/awx/ui/client/src/standard-out/inventory-sync/standard-out-inventory-sync.route.js b/awx/ui/client/src/standard-out/inventory-sync/standard-out-inventory-sync.route.js
index 468826bc5b..e9bfe68f63 100644
--- a/awx/ui/client/src/standard-out/inventory-sync/standard-out-inventory-sync.route.js
+++ b/awx/ui/client/src/standard-out/inventory-sync/standard-out-inventory-sync.route.js
@@ -21,9 +21,6 @@ export default {
         jobType: 'inventory_updates'
     },
     resolve: {
-        features: ['FeaturesService', function(FeaturesService) {
-            return FeaturesService.get();
-        }],
         inventorySyncSocket: [function() {
             // TODO: determine whether or not we have socket support for inventory sync standard out
             return true;
diff --git a/awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.route.js b/awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.route.js
index 8ff410f549..d98a2bd1d4 100644
--- a/awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.route.js
+++ b/awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.route.js
@@ -19,9 +19,6 @@ export default {
         jobType: 'system_jobs'
     },
     resolve: {
-        features: ['FeaturesService', function(FeaturesService) {
-            return FeaturesService.get();
-        }],
         managementJobSocket: [function() {
             // TODO: determine whether or not we have socket support for management job standard out
             return true;
diff --git a/awx/ui/client/src/standard-out/scm-update/standard-out-scm-update.route.js b/awx/ui/client/src/standard-out/scm-update/standard-out-scm-update.route.js
index dae4654cc8..9d399f05a9 100644
--- a/awx/ui/client/src/standard-out/scm-update/standard-out-scm-update.route.js
+++ b/awx/ui/client/src/standard-out/scm-update/standard-out-scm-update.route.js
@@ -21,9 +21,6 @@ export default {
         jobType: 'project_updates'
     },
     resolve: {
-        features: ['FeaturesService', function(FeaturesService) {
-            return FeaturesService.get();
-        }],
         scmUpdateSocket: [function() {
             // TODO: determine whether or not we have socket support for scm update standard out
             return true;