From a9900823f9e9a3e1af49b9944e2d3ab14456313d Mon Sep 17 00:00:00 2001
From: Walden Raines <walden@redhat.com>
Date: Fri, 28 Feb 2014 10:08:11 -0500
Subject: [PATCH] Remove code that has been replaced by bastion/v2 APIs.

Delete several old and unused UI controllers, views,
javascript files, styles, and tests as well as removing
unused functionality from remaining bastion-only UI controllers.
---
 .../katello/activation_keys/index.js          |   1 -
 .../katello/organizations/default_info.js     | 216 -----
 .../organizations/download_certificate.js     |  20 -
 .../katello/organizations/index.js            |  15 -
 .../katello/organizations/organization.js     |  68 --
 .../organizations/organization_edit.js        |  46 -
 .../katello/products/product_edit.js          |  76 --
 .../subscriptions/headpin.sparkline.js        |   6 -
 .../katello/subscriptions/index.js            |  17 -
 .../katello/subscriptions/subscription.js     | 126 ---
 .../katello/system_events/index.js            |  15 -
 .../katello/system_events/system_events.js    | 181 ----
 .../katello/system_groups/index.js            |  19 -
 .../katello/system_groups/package_actions.js  | 316 -------
 .../system_groups/system_group_events.js      |  23 -
 .../katello/system_groups/system_groups.js    | 445 ----------
 .../system_groups/system_groups_pane.js       | 141 ---
 .../katello/system_packages/index.js          |  16 -
 .../system_packages/packages_filtertable.js   |  63 --
 .../system_packages/system_packages.js        | 767 -----------------
 .../katello/systems/custom_info.js            |   1 +
 .../javascripts/katello/systems/index.js      |  28 -
 .../javascripts/katello/systems/packages.js   |  34 -
 .../katello/systems/system_edit.js            |  67 --
 .../katello/systems/system_errata.js          | 313 -------
 .../katello/systems/system_products.js        | 113 ---
 .../katello/systems/system_subscriptions.js   |  71 --
 .../javascripts/katello/systems/systems.js    | 793 -----------------
 app/assets/javascripts/katello/users/index.js |  16 -
 app/assets/javascripts/katello/users/user.js  | 102 ---
 .../javascripts/katello/users/user_methods.js | 111 ---
 app/assets/stylesheets/katello/katello.scss   |   3 -
 app/assets/stylesheets/katello/orgs.scss      |  60 --
 .../stylesheets/katello/subscriptions.scss    |  30 -
 app/assets/stylesheets/katello/systems.scss   | 349 --------
 app/controllers/katello/errata_controller.rb  |  75 --
 .../katello/organizations_controller.rb       | 245 +-----
 .../katello/products_controller.rb            | 118 +--
 .../katello/puppet_modules_controller.rb      |  68 --
 .../katello/subscriptions_controller.rb       | 288 +------
 .../katello/system_errata_controller.rb       | 109 ---
 .../katello/system_events_controller.rb       | 110 ---
 .../katello/system_group_errata_controller.rb | 106 ---
 .../katello/system_group_events_controller.rb | 123 ---
 .../system_group_packages_controller.rb       | 215 -----
 .../katello/system_groups_controller.rb       | 258 +-----
 .../katello/system_packages_controller.rb     | 201 -----
 app/controllers/katello/systems_controller.rb | 810 +-----------------
 .../katello/user_sessions_controller.rb       |  41 -
 .../katello/environments/_edit.html.haml      |  40 -
 app/views/katello/environments/_new.html.haml |  26 -
 .../katello/environments/_products.html.haml  |   4 -
 app/views/katello/errata/_packages.html.haml  |  30 -
 .../katello/errata/_short_details.html.haml   |  44 -
 app/views/katello/errata/_show.html.haml      |  85 --
 .../organizations/_default_info.html.haml     |  43 -
 .../_download_debug_certificate.html.haml     |  14 -
 .../katello/organizations/_edit.html.haml     |  87 --
 .../organizations/_environments.html.haml     |   2 -
 .../katello/organizations/_events.html.haml   |  29 -
 .../katello/organizations/_footer.html.haml   |  15 -
 .../katello/organizations/_new.html.haml      |  39 -
 .../organizations/_post_delete.js.haml        |   3 -
 .../katello/organizations/index.html.haml     |  14 -
 app/views/katello/products/_edit.html.haml    |  38 -
 app/views/katello/products/_new.html.haml     |  27 -
 .../katello/puppet_modules/_show.html.haml    |  88 --
 .../katello/repositories/_edit.html.haml      |  64 --
 app/views/katello/repositories/_new.html.haml |  60 --
 .../subscriptions/_consumers.html.haml        |  53 --
 .../katello/subscriptions/_edit.html.haml     | 119 ---
 .../subscriptions/_edit_manifest.html.haml    |  59 --
 .../katello/subscriptions/_history.html.haml  |  32 -
 .../subscriptions/_history_items.html.haml    |  33 -
 .../_list_subscription.html.haml              |   3 -
 .../_list_subscription_show.html.haml         |  21 -
 .../_list_subscriptions.html.haml             |   1 -
 .../katello/subscriptions/_new.html.haml      | 134 ---
 .../katello/subscriptions/_products.html.haml |  52 --
 ..._subscriptions_tupane_header_nav.html.haml |   5 -
 ...scriptions_tupane_header_new_nav.html.haml |   2 -
 .../katello/subscriptions/index.html.haml     |   4 -
 .../subscriptions/index_nutupane.html.haml    |  15 -
 .../katello/system_events/_details.html.haml  |  34 -
 .../system_events/_event_items.html.haml      |  27 -
 .../katello/system_events/_events.html.haml   |  36 -
 .../system_events/_more_events.html.haml      |   3 -
 .../katello/system_groups/_edit.html.haml     |  52 --
 .../system_groups/_edit_systems.html.haml     |  32 -
 .../system_groups/_list_group.html.haml       |   4 -
 .../system_groups/_list_groups.html.haml      |   1 -
 .../katello/system_groups/_new.html.haml      |  50 --
 .../system_groups/_system_item.html.haml      |  16 -
 .../katello/system_groups/_systems.html.haml  |  67 --
 .../system_groups/_tupane_header.html.haml    |  15 -
 .../system_groups/errata/_index.html.haml     |  72 --
 .../system_groups/events/_index.html.haml     |  33 -
 .../system_groups/events/_items.html.haml     |  29 -
 .../events/_more_items.html.haml              |   3 -
 .../system_groups/events/_show.html.haml      |  29 -
 .../events/_system_items.html.haml            |  27 -
 .../system_groups/events/_systems.html.haml   |  15 -
 .../katello/system_groups/index.html.haml     |  22 -
 .../system_groups/packages/_index.html.haml   |  70 --
 .../system_groups/packages/_items.html.haml   |  30 -
 .../system_groups/packages/_status.html.haml  |   5 -
 .../system_packages/_package_items.html.haml  |  43 -
 .../system_packages/_packages.html.haml       | 132 ---
 app/views/katello/systems/_actions.html.haml  |  96 ---
 app/views/katello/systems/_edit.html.haml     | 229 -----
 .../systems/_edit_custom_info.html.haml       |  10 -
 app/views/katello/systems/_facts.html.haml    |  33 -
 .../katello/systems/_hypervisor.html.haml     |   7 -
 .../katello/systems/_list_system.html.haml    |   2 -
 .../systems/_list_system_show.html.haml       |  25 -
 .../katello/systems/_list_systems.html.haml   |   1 -
 .../katello/systems/_more_products.html.haml  |   9 -
 app/views/katello/systems/_new.html.haml      |  20 -
 app/views/katello/systems/_products.html.haml |  23 -
 app/views/katello/systems/_subs.html.haml     | 144 ----
 .../katello/systems/_subs_update.js.haml      |   1 -
 .../systems/_subscription_details.html.haml   |  23 -
 .../katello/systems/_subscriptions.html.haml  |  28 -
 .../systems/_system_group_items.html.haml     |   7 -
 .../katello/systems/_system_groups.html.haml  |  26 -
 .../_system_tupane_header_nav.html.haml       |  10 -
 .../katello/systems/errata/_index.html.haml   |  62 --
 .../katello/systems/errata/_items.html.haml   |  21 -
 app/views/katello/systems/index.html.haml     |  46 -
 .../katello/systems/new_nutupane.html.haml    |  52 --
 .../katello/systems/show_nutupane.html.haml   | 199 -----
 config/routes.rb                              | 118 +--
 lib/katello/tasks/test.rake                   |   3 -
 .../organizations_controller_spec.rb          | 298 -------
 spec/controllers/products_controller_spec.rb  | 112 ---
 .../subscriptions_controller_data.rb          | 548 ------------
 .../subscriptions_controller_spec.rb          |  83 --
 .../system_errata_controller_spec.rb          | 111 ---
 .../system_events_controller_spec.rb          |  75 --
 .../system_group_errata_controller_spec.rb    | 109 ---
 .../system_group_events_controller_spec.rb    | 122 ---
 .../system_group_packages_controller_spec.rb  | 266 ------
 .../system_groups_controller_spec.rb          | 332 -------
 .../system_packages_controller_spec.rb        | 278 ------
 .../api/v2/repository_sets_controller_test.rb | 121 ---
 .../subscriptions_controller_test.rb          |  37 +
 test/controllers/systems_controller_test.rb   |  60 --
 147 files changed, 57 insertions(+), 13257 deletions(-)
 delete mode 100644 app/assets/javascripts/katello/organizations/default_info.js
 delete mode 100644 app/assets/javascripts/katello/organizations/download_certificate.js
 delete mode 100644 app/assets/javascripts/katello/organizations/index.js
 delete mode 100644 app/assets/javascripts/katello/organizations/organization.js
 delete mode 100644 app/assets/javascripts/katello/organizations/organization_edit.js
 delete mode 100644 app/assets/javascripts/katello/products/product_edit.js
 delete mode 100644 app/assets/javascripts/katello/subscriptions/headpin.sparkline.js
 delete mode 100644 app/assets/javascripts/katello/subscriptions/index.js
 delete mode 100644 app/assets/javascripts/katello/subscriptions/subscription.js
 delete mode 100644 app/assets/javascripts/katello/system_events/index.js
 delete mode 100644 app/assets/javascripts/katello/system_events/system_events.js
 delete mode 100644 app/assets/javascripts/katello/system_groups/index.js
 delete mode 100644 app/assets/javascripts/katello/system_groups/package_actions.js
 delete mode 100644 app/assets/javascripts/katello/system_groups/system_group_events.js
 delete mode 100644 app/assets/javascripts/katello/system_groups/system_groups.js
 delete mode 100644 app/assets/javascripts/katello/system_groups/system_groups_pane.js
 delete mode 100644 app/assets/javascripts/katello/system_packages/index.js
 delete mode 100644 app/assets/javascripts/katello/system_packages/packages_filtertable.js
 delete mode 100644 app/assets/javascripts/katello/system_packages/system_packages.js
 delete mode 100644 app/assets/javascripts/katello/systems/index.js
 delete mode 100644 app/assets/javascripts/katello/systems/packages.js
 delete mode 100644 app/assets/javascripts/katello/systems/system_edit.js
 delete mode 100644 app/assets/javascripts/katello/systems/system_errata.js
 delete mode 100644 app/assets/javascripts/katello/systems/system_products.js
 delete mode 100644 app/assets/javascripts/katello/systems/system_subscriptions.js
 delete mode 100644 app/assets/javascripts/katello/systems/systems.js
 delete mode 100644 app/assets/javascripts/katello/users/index.js
 delete mode 100644 app/assets/javascripts/katello/users/user.js
 delete mode 100644 app/assets/javascripts/katello/users/user_methods.js
 delete mode 100644 app/assets/stylesheets/katello/orgs.scss
 delete mode 100644 app/assets/stylesheets/katello/subscriptions.scss
 delete mode 100644 app/assets/stylesheets/katello/systems.scss
 delete mode 100644 app/controllers/katello/errata_controller.rb
 delete mode 100644 app/controllers/katello/puppet_modules_controller.rb
 delete mode 100644 app/controllers/katello/system_errata_controller.rb
 delete mode 100644 app/controllers/katello/system_events_controller.rb
 delete mode 100644 app/controllers/katello/system_group_errata_controller.rb
 delete mode 100644 app/controllers/katello/system_group_events_controller.rb
 delete mode 100644 app/controllers/katello/system_group_packages_controller.rb
 delete mode 100644 app/controllers/katello/system_packages_controller.rb
 delete mode 100644 app/controllers/katello/user_sessions_controller.rb
 delete mode 100644 app/views/katello/environments/_edit.html.haml
 delete mode 100644 app/views/katello/environments/_new.html.haml
 delete mode 100644 app/views/katello/environments/_products.html.haml
 delete mode 100644 app/views/katello/errata/_packages.html.haml
 delete mode 100644 app/views/katello/errata/_short_details.html.haml
 delete mode 100644 app/views/katello/errata/_show.html.haml
 delete mode 100644 app/views/katello/organizations/_default_info.html.haml
 delete mode 100644 app/views/katello/organizations/_download_debug_certificate.html.haml
 delete mode 100644 app/views/katello/organizations/_edit.html.haml
 delete mode 100644 app/views/katello/organizations/_environments.html.haml
 delete mode 100644 app/views/katello/organizations/_events.html.haml
 delete mode 100644 app/views/katello/organizations/_footer.html.haml
 delete mode 100644 app/views/katello/organizations/_new.html.haml
 delete mode 100644 app/views/katello/organizations/_post_delete.js.haml
 delete mode 100644 app/views/katello/organizations/index.html.haml
 delete mode 100644 app/views/katello/products/_edit.html.haml
 delete mode 100644 app/views/katello/products/_new.html.haml
 delete mode 100644 app/views/katello/puppet_modules/_show.html.haml
 delete mode 100644 app/views/katello/repositories/_edit.html.haml
 delete mode 100644 app/views/katello/repositories/_new.html.haml
 delete mode 100644 app/views/katello/subscriptions/_consumers.html.haml
 delete mode 100644 app/views/katello/subscriptions/_edit.html.haml
 delete mode 100644 app/views/katello/subscriptions/_edit_manifest.html.haml
 delete mode 100644 app/views/katello/subscriptions/_history.html.haml
 delete mode 100644 app/views/katello/subscriptions/_history_items.html.haml
 delete mode 100644 app/views/katello/subscriptions/_list_subscription.html.haml
 delete mode 100644 app/views/katello/subscriptions/_list_subscription_show.html.haml
 delete mode 100644 app/views/katello/subscriptions/_list_subscriptions.html.haml
 delete mode 100644 app/views/katello/subscriptions/_new.html.haml
 delete mode 100644 app/views/katello/subscriptions/_products.html.haml
 delete mode 100644 app/views/katello/subscriptions/_subscriptions_tupane_header_nav.html.haml
 delete mode 100644 app/views/katello/subscriptions/_subscriptions_tupane_header_new_nav.html.haml
 delete mode 100644 app/views/katello/subscriptions/index.html.haml
 delete mode 100644 app/views/katello/subscriptions/index_nutupane.html.haml
 delete mode 100644 app/views/katello/system_events/_details.html.haml
 delete mode 100644 app/views/katello/system_events/_event_items.html.haml
 delete mode 100644 app/views/katello/system_events/_events.html.haml
 delete mode 100644 app/views/katello/system_events/_more_events.html.haml
 delete mode 100644 app/views/katello/system_groups/_edit.html.haml
 delete mode 100644 app/views/katello/system_groups/_edit_systems.html.haml
 delete mode 100644 app/views/katello/system_groups/_list_group.html.haml
 delete mode 100644 app/views/katello/system_groups/_list_groups.html.haml
 delete mode 100644 app/views/katello/system_groups/_new.html.haml
 delete mode 100644 app/views/katello/system_groups/_system_item.html.haml
 delete mode 100644 app/views/katello/system_groups/_systems.html.haml
 delete mode 100644 app/views/katello/system_groups/_tupane_header.html.haml
 delete mode 100644 app/views/katello/system_groups/errata/_index.html.haml
 delete mode 100644 app/views/katello/system_groups/events/_index.html.haml
 delete mode 100644 app/views/katello/system_groups/events/_items.html.haml
 delete mode 100644 app/views/katello/system_groups/events/_more_items.html.haml
 delete mode 100644 app/views/katello/system_groups/events/_show.html.haml
 delete mode 100644 app/views/katello/system_groups/events/_system_items.html.haml
 delete mode 100644 app/views/katello/system_groups/events/_systems.html.haml
 delete mode 100644 app/views/katello/system_groups/index.html.haml
 delete mode 100644 app/views/katello/system_groups/packages/_index.html.haml
 delete mode 100644 app/views/katello/system_groups/packages/_items.html.haml
 delete mode 100644 app/views/katello/system_groups/packages/_status.html.haml
 delete mode 100644 app/views/katello/system_packages/_package_items.html.haml
 delete mode 100644 app/views/katello/system_packages/_packages.html.haml
 delete mode 100644 app/views/katello/systems/_actions.html.haml
 delete mode 100644 app/views/katello/systems/_edit.html.haml
 delete mode 100644 app/views/katello/systems/_edit_custom_info.html.haml
 delete mode 100644 app/views/katello/systems/_facts.html.haml
 delete mode 100644 app/views/katello/systems/_hypervisor.html.haml
 delete mode 100644 app/views/katello/systems/_list_system.html.haml
 delete mode 100644 app/views/katello/systems/_list_system_show.html.haml
 delete mode 100644 app/views/katello/systems/_list_systems.html.haml
 delete mode 100644 app/views/katello/systems/_more_products.html.haml
 delete mode 100644 app/views/katello/systems/_new.html.haml
 delete mode 100644 app/views/katello/systems/_products.html.haml
 delete mode 100644 app/views/katello/systems/_subs.html.haml
 delete mode 100644 app/views/katello/systems/_subs_update.js.haml
 delete mode 100644 app/views/katello/systems/_subscription_details.html.haml
 delete mode 100644 app/views/katello/systems/_subscriptions.html.haml
 delete mode 100644 app/views/katello/systems/_system_group_items.html.haml
 delete mode 100644 app/views/katello/systems/_system_groups.html.haml
 delete mode 100644 app/views/katello/systems/_system_tupane_header_nav.html.haml
 delete mode 100644 app/views/katello/systems/errata/_index.html.haml
 delete mode 100644 app/views/katello/systems/errata/_items.html.haml
 delete mode 100644 app/views/katello/systems/index.html.haml
 delete mode 100644 app/views/katello/systems/new_nutupane.html.haml
 delete mode 100644 app/views/katello/systems/show_nutupane.html.haml
 delete mode 100644 spec/controllers/organizations_controller_spec.rb
 delete mode 100644 spec/controllers/subscriptions_controller_data.rb
 delete mode 100644 spec/controllers/subscriptions_controller_spec.rb
 delete mode 100644 spec/controllers/system_errata_controller_spec.rb
 delete mode 100644 spec/controllers/system_events_controller_spec.rb
 delete mode 100644 spec/controllers/system_group_errata_controller_spec.rb
 delete mode 100644 spec/controllers/system_group_events_controller_spec.rb
 delete mode 100644 spec/controllers/system_group_packages_controller_spec.rb
 delete mode 100644 spec/controllers/system_packages_controller_spec.rb
 delete mode 100644 test/controllers/api/v2/repository_sets_controller_test.rb
 create mode 100644 test/controllers/subscriptions_controller_test.rb
 delete mode 100644 test/controllers/systems_controller_test.rb

diff --git a/app/assets/javascripts/katello/activation_keys/index.js b/app/assets/javascripts/katello/activation_keys/index.js
index 7a0b0e1ddcb..4ad03b98ec7 100644
--- a/app/assets/javascripts/katello/activation_keys/index.js
+++ b/app/assets/javascripts/katello/activation_keys/index.js
@@ -14,4 +14,3 @@
 //= require "alchemy/jquery/plugins/jquery.multiselect"
 //= require "alchemy/jquery/plugins/jquery.multiselect.filter"
 //= require "katello/activation_keys/activation_key"
-//= require "katello/system_groups/system_groups_pane"
diff --git a/app/assets/javascripts/katello/organizations/default_info.js b/app/assets/javascripts/katello/organizations/default_info.js
deleted file mode 100644
index 563ad7e5a55..00000000000
--- a/app/assets/javascripts/katello/organizations/default_info.js
+++ /dev/null
@@ -1,216 +0,0 @@
-/**
- Copyright 2013 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-
-var KT = (KT === undefined) ? {} : KT;
-
-KT.default_info = (function() {
-
-    var task_status_updater;
-
-    var start_updater = function(task_uuid) {
-        allow_default_info_manipulation(false);
-        $("#apply_default_info_button").addClass("processing");
-        var timeout = 6000;
-
-        if (task_status_updater !== undefined) {
-            task_status_updater.stop();
-        }
-
-        task_status_updater = $.PeriodicalUpdater(
-            KT.routes.api_task_path(task_uuid),
-            {
-                method    : 'get',
-                type      : 'json',
-                cache     : false,
-                global    : false,
-                minTimeout: timeout,
-                maxTimeout: timeout
-            },
-            updateStatus
-        );
-    };
-
-    var async_panel_refresh = function (){
-        if ($("#apply_default_info_button").length > 0) {
-            if (task_status_updater !== undefined) {
-                task_status_updater.stop();
-            }
-            var state = $("#apply_default_info_button").data("taskstate");
-            if (state === "waiting" || state === "running") {
-                start_updater($("#apply_default_info_button").data("taskuuid"));
-            }
-        }
-    };
-
-    var updateStatus = function(data, success, xhr, handle) {
-        if (data !== "") { // "" means nothing has changed since the last poll
-            var state = data['state'];
-            if (state !== "waiting" && state !== "running") {
-                $("#apply_default_info_button").removeClass("processing");
-                allow_default_info_manipulation(true);
-                task_status_updater.stop();
-                if (data['result'].length > 0) {
-                    notices.displayNotice("success", window.JSON.stringify({ "notices": [i18n.default_info_apply_success] }));
-                }
-            }
-        }
-    };
-
-    var check_for_apply_button_enable = function() {
-        if ($("#default_info_table tr").length > 1) {
-            $("#apply_default_info_button").removeAttr("disabled");
-        } else {
-            $("#apply_default_info_button").attr("disabled", "true");
-        }
-    };
-
-    var allow_default_info_manipulation = function(allow) {
-        if (allow === true) {
-            $("#new_default_info_keyname").removeAttr("disabled");
-            check_for_empty($("#new_default_info_keyname"));
-            $(".remove_default_info_button").removeAttr("disabled");
-            check_for_apply_button_enable();
-        } else {
-            $("#apply_default_info_button").attr("disabled", "true");
-            $("#new_default_info_keyname").attr("disabled", "true");
-            $("#add_default_info_button").attr("disabled", "true");
-            $(".remove_default_info_button").attr("disabled", "true");
-        }
-    };
-
-    var check_for_empty = function($textfield) {
-        if ($textfield.val().length > 0 ) {
-            $('#add_default_info_button').removeAttr("disabled");
-        } else {
-            $('#add_default_info_button').attr("disabled", "true");
-        }
-    };
-
-    var apply_default_info = function($button) {
-        $.ajax({
-            url    : $button.data('url'),
-            type   : $button.data('method'),
-            success: function(data) {
-                start_updater(data['task']['uuid']);
-            },
-            error  : function(data) {
-                notices.displayNotice("error", window.JSON.stringify({ "notices": [i18n.default_info_apply_error] }));
-            }
-        });
-    };
-
-    var add_default_info = function($button) {
-        var keyname = $("#new_default_info_keyname").val();
-
-        $.ajax({
-            url     : $button.data("url"),
-            type    : $button.data("method"),
-            dataType: 'json',
-            data    : { "keyname" : keyname },
-            success : function(data) {
-                add_default_info_row(data);
-                notices.displayNotice("success", window.JSON.stringify({ "notices": [i18n.default_info_create_success] }));
-            },
-            error   : function(data) {
-                message = KT.utils.escape($.parseJSON(data.responseText)["displayMessage"]);
-                notices.displayNotice("error", window.JSON.stringify({ "notices": [message] }));
-            }
-        });
-    };
-
-    var remove_default_info = function($button) {
-        $.ajax({
-            url    : $button.data("url"),
-            type   : $button.data("method"),
-            success: function(data) {
-                remove_default_info_row($button.data("id"));
-                notices.displayNotice("success", window.JSON.stringify({ "notices": [i18n.default_info_delete_success] }));
-            }
-        });
-    };
-
-    var remove_default_info_row = function(data_id) {
-        $("tr[data-id='" + data_id + "']").remove();
-        check_for_apply_button_enable();
-    };
-
-    var add_default_info_row = function(data) {
-        var keyname = data["keyname"];
-        var _keyname = escape(keyname);
-
-        var informable_type = data["informable_type"];
-        var org = data["organization"];
-        var destroy_path = KT.routes.api_organization_destroy_default_info_path(org["name"], informable_type, _keyname);
-
-        var new_row = $('<tr/>', {
-            'class': 'multiline primary_color',
-            'data-id': 'default_info_' + _keyname,
-            'html': $('<td/>', {
-                'class': 'ra',
-                'html': $('<label/>', {
-                    'for': 'default_info_' + _keyname,
-                    'text': keyname
-                })
-            }).after($('<td/>', {
-                'html': $('<input/>', {
-                    'class': 'btn warning remove_default_info_button',
-                    'data-id': 'default_info_' + _keyname,
-                    'data-method': 'delete',
-                    'data-url': destroy_path,
-                    'type': 'submit',
-                    'value': i18n.remove
-                })
-            }))
-        });
-
-        $("#new_default_info_row").after(new_row);
-        setTimeout(function() { $("tr[data-id='default_info_" + _keyname + "']").addClass("row_fade_in"); }, 1); // hax
-        $("#new_default_info_keyname").val("");
-        check_for_empty($("#new_default_info_keyname"));
-        check_for_apply_button_enable();
-    };
-
-    $("#new_default_info_keyname").live("keydown", function(e) {
-        if (e.keyCode === 13) { // if you press enter
-            $("#add_default_info_button").trigger("click");
-        }
-    });
-
-    $("#apply_default_info_button").live("click", function(e) {
-        var button = $(this);
-        e.preventDefault();
-        KT.common.customConfirm({
-            message     : i18n.default_info_warning,
-            yes_callback: function() {
-                apply_default_info(button);
-            }
-        });
-    });
-
-    $('#new_default_info_keyname').live('keyup', function(e) {
-        check_for_empty($(this));
-    });
-
-    $('#add_default_info_button').live('click', function(e) {
-        e.preventDefault();
-        add_default_info($(this));
-    });
-
-    $('.remove_default_info_button').live('click', function(e) {
-        e.preventDefault();
-        remove_default_info($(this));
-    });
-
-    KT.panel.set_expand_cb(function() { async_panel_refresh(); });
-
-})();
diff --git a/app/assets/javascripts/katello/organizations/download_certificate.js b/app/assets/javascripts/katello/organizations/download_certificate.js
deleted file mode 100644
index dcaac0636b5..00000000000
--- a/app/assets/javascripts/katello/organizations/download_certificate.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- Copyright 2013 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-
-$(document).ready(function() {
-    $('#download_debug_cert_key').live('click', function(e) {
-        e.preventDefault();
-        window.location.href = $("#download_debug_cert_key").data("url");
-        return false;
-    });
-});
diff --git a/app/assets/javascripts/katello/organizations/index.js b/app/assets/javascripts/katello/organizations/index.js
deleted file mode 100644
index b59f2f32709..00000000000
--- a/app/assets/javascripts/katello/organizations/index.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- Copyright 2013 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-
-//= require "katello/organizations/organization"
-//= require "katello/organizations/default_info"
diff --git a/app/assets/javascripts/katello/organizations/organization.js b/app/assets/javascripts/katello/organizations/organization.js
deleted file mode 100644
index 81f2e377b09..00000000000
--- a/app/assets/javascripts/katello/organizations/organization.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- Copyright 2013 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-
-KT.panel.list.registerPage('organizations', { create : 'new_organization' });
-
-$(document).ready(function() {
-
-    var env_scroll = KT.env_select_scroll({});
-    KT.panel.set_expand_cb(function() {
-        var children = $('#panel .menu_parent');
-        $.each(children, function(i, item) {
-            KT.menu.hoverMenu(item, { top : '75px' });
-        });
-
-        env_scroll.bind(undefined);
-        KT.object.label.initialize();
-        if ($('#organization_edit').length > 0) {
-            notices.checkNotices();
-        }
-    });
-
-    $('.environment_link').live('click', function() {
-         $(this).siblings().show();
-    });
-
-    $('#debug_cert').live('click',function(){
-        $('#show_debug_button').slideToggle();
-
-        var arrow = $(this).parent().find('img');
-        if (arrow.attr("src").indexOf("collapsed") === -1) {
-            arrow.attr("src", KT.common.rootURL() + "assets/icons/expander-collapsed.png");
-        } else {
-            arrow.attr("src", KT.common.rootURL() + "assets/icons/expander-expanded.png");
-        }
-        return false;
-    });
-
-    $('#download_debug_cert_key').live('click', function(e) {
-        e.preventDefault();  //stop the browser from following
-        url = $("#download_debug_cert_key").data("url");
-        window.location.href = url;
-        return false;
-    });
-
-    $('#label_default_org').live('click', function(e) {
-        KT.orgswitcher.checkboxChanged($('#default_org'));
-    });
-
-    $('#save_name').live('ajax:complete', function(evt, data, status, xhr) {
-        // Refresh the entry in the left list
-        var id = $('.left_panel').find('.active');
-        var url = id.attr('data-ajax_url');
-        KT.panel.list.refresh(id.attr('id'), url);
-
-        // Refresh the name displayed at the top of the right panel
-    });
-
-});
diff --git a/app/assets/javascripts/katello/organizations/organization_edit.js b/app/assets/javascripts/katello/organizations/organization_edit.js
deleted file mode 100644
index 41e5e8655d3..00000000000
--- a/app/assets/javascripts/katello/organizations/organization_edit.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- Copyright 2013 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-
-$(document).ready(function() {
-
-    // Auto-heal with service level used in systems/_subscriptions.html.haml
-    $('.edit_select_org_servicelevel').each(function(){
-        var common_settings = {
-                method          :  'PUT',
-                cancel          :  i18n.cancel,
-                submit          :  i18n.save,
-                indicator       :  i18n.saving,
-                tooltip         :  i18n.clickToEdit,
-                placeholder     :  i18n.orgSelectAutoheal,
-                submitdata      :  $.extend({ authenticity_token: AUTH_TOKEN }, KT.common.getSearchParams()),
-                onerror         :  function(settings, original, xhr) {
-                    original.reset();
-                    $("#notification").replaceWith(xhr.responseText);
-                    notices.checkNotices();
-                }
-        };
-        var element = $(this),
-            settings = {
-                type            :  'select',
-                name            :  element.attr('name'),
-                data            :  element.data('options'),
-                onsuccess       :  function(result, status, xhr){
-                    element.select(xhr.responseText);
-                    notices.checkNotices();
-                }
-            };
-        $(this).editable($(this).attr('data-url'), $.extend(common_settings, settings));
-    });
-
-
-});
diff --git a/app/assets/javascripts/katello/products/product_edit.js b/app/assets/javascripts/katello/products/product_edit.js
deleted file mode 100644
index 65da7451e22..00000000000
--- a/app/assets/javascripts/katello/products/product_edit.js
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- Copyright 2013 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- */
-
-$(document).ready(function () {
-    var common_settings = {
-        method: 'PUT',
-        cancel: i18n.cancel,
-        submit: i18n.save,
-        indicator: i18n.saving,
-        tooltip: i18n.clickToEdit,
-        placeholder: i18n.clickToEdit,
-        submitdata: $.extend({ authenticity_token: AUTH_TOKEN }, KT.common.getSearchParams()),
-        onerror: function (settings, original, xhr) {
-            original.reset();
-            $("#notification").replaceWith(xhr.responseText);
-            notices.checkNotices();
-        }
-    };
-    // callback which fires product update, whether to update also related repositories is decided
-    // by with_all_repos argument
-    var update_product = function (element, result, with_all_repos) {
-        $.ajax({
-            type: 'PUT',
-            url: element.data('url'),
-            data: { 'product[gpg_all_repos]': with_all_repos,
-                'product[gpg_key]': result },
-            success: function (data) {
-                notices.checkNotices();
-            }
-        });
-    };
-
-
-    $('.edit_select_product_gpg').each(function () {
-        var element = $(this),
-            settings = {
-                type: 'select',
-                name: element.attr('name'),
-                data: element.data('options'),
-                onsubmit: function () {
-                    result = element.find('form select[name="product[gpg_key]"]').val();
-                    var data = element.data('options');
-
-                    data["selected"] = result;
-                    element.html(data[result]);
-                    if (result !== "") {
-                        KT.common.customConfirm({
-                            message: i18n.productUpdateKeyConfirm,
-                            warning_message: i18n.productUpdateKeyWarning,
-                            yes_callback: function () {
-                                update_product(element, result, true);
-                            },
-                            no_callback: function () {
-                                update_product(element, result, false);
-                            }
-                        });
-                    }
-                }
-            };
-        // we ignore default submit function by injecting empty function, all submitting is done
-        // by onsubmit callback
-        $(this).editable(function () {
-        }, $.extend(common_settings, settings));
-    });
-
-});
diff --git a/app/assets/javascripts/katello/subscriptions/headpin.sparkline.js b/app/assets/javascripts/katello/subscriptions/headpin.sparkline.js
deleted file mode 100644
index 54118942694..00000000000
--- a/app/assets/javascripts/katello/subscriptions/headpin.sparkline.js
+++ /dev/null
@@ -1,6 +0,0 @@
-$(document).ready(function() {
-
-  $("span.sparkpie").sparkline('html', { type: 'pie'});
-  $("span.sparkline").sparkline('html', { type: 'line'});
-
-});
diff --git a/app/assets/javascripts/katello/subscriptions/index.js b/app/assets/javascripts/katello/subscriptions/index.js
deleted file mode 100644
index 8e3866a7c17..00000000000
--- a/app/assets/javascripts/katello/subscriptions/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- Copyright 2013 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-
-//= require "alchemy/jquery/plugins/jquery.treeTable"
-//= require "alchemy/jquery/plugins/jquery.ui.multiselect"
-//= require "katello/subscriptions/subscription"
-//= require "katello/subscriptions/headpin.sparkline"
diff --git a/app/assets/javascripts/katello/subscriptions/subscription.js b/app/assets/javascripts/katello/subscriptions/subscription.js
deleted file mode 100644
index dd3ac6a5097..00000000000
--- a/app/assets/javascripts/katello/subscriptions/subscription.js
+++ /dev/null
@@ -1,126 +0,0 @@
-
-/**
- Copyright 2013 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-
-KT.subscription = (function() {
-    var manifest_updater;
-
-    // Data that is unchanged from previous will come in as ""
-    var updateStatus = function(data) {
-        if (data !== "" && $('.manifest_progress_message')) {
-            $(".manifest_progress_message").html(i18n.import_in_progress(data["state"]));
-        }
-        if (data !== "" && data["state"] !== "running" && data["state"] !== "waiting") {
-            notices.checkNotices();
-            if (manifest_updater) {
-                manifest_updater.stop();
-            }
-
-            active = $('#new');
-            KT.panel.list.refresh_list();
-            KT.panel.panelAjax(active, active.attr("data-ajax_url"), $('#panel'), false);
-        }
-    },
-    startUpdater = function() {
-        var timeout = 6000,
-            provider_id;
-
-        if (manifest_updater !== undefined) {
-            manifest_updater.stop();
-        }
-
-        // When the manifest progress element is present, start the polling for success
-        provider_id = $('.manifest_progress').attr("provider_id");
-        if (provider_id) {
-            manifest_updater = $.PeriodicalUpdater(KT.common.rootURL() + '/providers/' + provider_id + '/manifest_progress/', {
-                method: 'get',
-                type: 'json',
-                cache: false,
-                global: false,
-                minTimeout: timeout,
-                maxTimeout: timeout
-            }, updateStatus);
-        }
-
-        notices.checkNotices();
-    },
-    initSubscription = function initSubscription() {
-        startUpdater();
-    };
-
-    return {
-        startUpdater: startUpdater,
-        updateStatus: updateStatus
-    };
-}());
-
-$(document).ready(function() {
-
-    var options = { };
-    KT.panel.list.registerPage('subscriptions', options);
-
-    $('#upload_manifest').live('submit', function(e) {
-        var ajax_handler;
-        var active;
-
-        // disable submit to avoid duplicate clicks
-        $('#upload_form_button').val(i18n.uploading).attr("disabled", true);
-        $('#upload_manifest').attr("disabled", true);
-
-        ajax_handler = function(data) {
-            // Refresh the "new" panel
-            active = $('#new');
-            KT.panel.panelAjax(active, active.attr("data-ajax_url"), $('#panel'), false);
-
-            // Initialize the polling for "upload in progress"
-            KT.subscription.startUpdater();
-        };
-        e.preventDefault();
-        $(this).ajaxSubmit({
-            success: ajax_handler,
-            error: ajax_handler
-        });
-    });
-
-    $('#refresh_form_button').live('click', function(e) {
-        var ajax_handler;
-        var active;
-
-        // disable submit to avoid duplicate clicks
-        $('#refresh_form_button').val(i18n.refreshing).attr("disabled", true);
-        $('#upload_manifest').attr("disabled", true);
-
-        ajax_handler = function(data) {
-            // Refresh the "new" panel
-            active = $('#new');
-            KT.panel.panelAjax(active, active.attr("data-ajax_url"), $('#panel'), false);
-
-            // Initialize the polling for "upload in progress"
-            KT.subscription.startUpdater();
-        };
-        e.preventDefault();
-        $('#refresh_manifest').ajaxSubmit({
-            success: ajax_handler,
-            error: ajax_handler
-        });
-    });
-
-    var delete_manifest_callback = function(evt, data, status, xhr){
-        var active = $('#new');
-        notices.checkNotices();
-        KT.panel.list.refresh_list();
-        KT.panel.panelAjax(active, active.attr("data-ajax_url"), $('#panel'), false);
-    };
-    $('#delete_manifest').live('ajax:success', delete_manifest_callback);
-    $('#delete_manifest').live('ajax:error', delete_manifest_callback);
-});
diff --git a/app/assets/javascripts/katello/system_events/index.js b/app/assets/javascripts/katello/system_events/index.js
deleted file mode 100644
index 857dd7dc559..00000000000
--- a/app/assets/javascripts/katello/system_events/index.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- Copyright 2013 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-
-//= require "katello/widgets/filtertable"
-//= require "katello/system_events/system_events"
diff --git a/app/assets/javascripts/katello/system_events/system_events.js b/app/assets/javascripts/katello/system_events/system_events.js
deleted file mode 100644
index 40e134e3fc6..00000000000
--- a/app/assets/javascripts/katello/system_events/system_events.js
+++ /dev/null
@@ -1,181 +0,0 @@
-
-/**
- Copyright 2013 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-/**
- * This file is for use with the events subnav within systems page.
- * It is also used on the events subnav of the distributors page.
- */
-
-
-KT.events = (function() {
-
-    var total_events = 0,
-    total_loaded = 0,
-    actions_updater,
-    loaded_summary = $('#loaded_summary'),
-    more_button = $('#more'),
-    page_size = 0,
-    moreEvents = function() {
-        var list = $('.events'),
-        spinner = $('#list-spinner'),
-        dataScrollURL = more_button.data("scroll_url") + "?offset=" + total_loaded +"&";
-        spinner.fadeIn();
-        $.ajax({
-            type: "GET",
-            url: dataScrollURL,
-            cache: false,
-            success: function(data) {
-                spinner.fadeOut();
-                list.append(data);
-                $('#filter').keyup();
-                $('.scroll-pane').jScrollPane().data('jsp').reinitialise();
-                updateLoadedSummary();
-
-                if (total_loaded === total_events) {
-                    more_button.empty().remove();
-                }
-            },
-            error: function() {
-                spinner.fadeOut();
-            }
-        });
-    },
-    updateStatus = function(data) {
-        // For each action that the user has initiated, update the status.
-        var jobs = data["jobs"],
-            tasks = data["tasks"];
-
-        if (tasks) {
-            $.each(tasks, function(index, status) {
-                var node,
-                    msg;
-
-                if(!status["pending?"]) {
-                    node = $('.event_name[data-pending-task-id=' + status['id'] + ']');
-                    if(node !== undefined) {
-                        node.parent().html(status["status_html"]);
-                    }
-                }
-            });
-        }
-
-        if (jobs) {
-            $.each(jobs, function(index, status) {
-                var node,
-                    msg;
-
-                if(!status["pending?"]) {
-                    node = $('.event_name[data-pending-job-id=' + status['id'] + ']');
-                    if(node !== undefined) {
-                        node.parent().html(status["status_html"]);
-                    }
-                }
-            });
-        }
-
-        if(($('.event_name[data-pending-task-id]').length === 0) && ($('.event_name[data-pending-job-id]').length === 0)) {
-            actions_updater.stop();
-        }
-    },
-    startUpdater = function () {
-        var timeout = 8000,
-            pending_jobs = [],
-            pending_tasks = [];
-
-        $('.event_name[data-pending-job-id]').each(function(i) {
-            pending_jobs[i] = $(this).data("pending-job-id");
-        });
-        $('.event_name[data-pending-task-id]').each(function(i) {
-            pending_tasks[i] = $(this).data("pending-task-id");
-        });
-
-        if(pending_jobs.length > 0 || pending_tasks.length > 0) {
-            if (actions_updater !== undefined) {
-                actions_updater.stop();
-            }
-            actions_updater = $.PeriodicalUpdater($('.events').data('url'), {
-                method: 'get',
-                type: 'json',
-                data: function() {return {task_id: pending_tasks, job_id: pending_jobs};},
-                global: false,
-                minTimeout: timeout,
-                maxTimeout: timeout
-            }, updateStatus);
-        }
-    },
-    initEvents = function() {
-        total_events = $('.events').data('total_events');
-        if(total_events !== undefined) {
-            total_events = parseInt(total_events, 10);
-        } else {
-            total_events = 0;
-        }
-        if(total_events > 0) {
-            if(more_button !== undefined) {
-                page_size = parseInt(more_button.data("page_size"),10);
-                more_button.bind('click', moreEvents);
-            } else {
-                page_size = 0;
-            }
-
-            updateLoadedSummary();
-
-            var  search_button = $('#event_filter_button'),
-                    search_field = $('#event_search_filter'),
-                spinner = $('#list-spinner');
-
-            search_button.live('click', function(evt){
-                evt.preventDefault();
-                $.ajax({
-                    type: "GET",
-                    url: search_field.data('search_url'),
-                    data: {search: search_field.val()},
-                    cache: false,
-                    success: function(data) {
-                        spinner.fadeOut();
-                        $("#event_items").html(data["html"]);
-                        $('#filter').keyup();
-                        $('.scroll-pane').jScrollPane().data('jsp').reinitialise();
-                        updateLoadedSummary();
-                        if (total_loaded === total_events) {
-                            more_button.empty().remove();
-                        }
-                    },
-                    error: function() {
-                        spinner.fadeOut();
-                    }
-                });
-            });
-        }
-        if(($('.event_name[data-pending-task-id]').length > 0) || ($('.event_name[data-pending-job-id]').length > 0)) {
-            startUpdater();
-        }
-    },
-    updateLoadedSummary = function() {
-        var more_size = page_size;
-        total_loaded = $('tr.tasks').length;
-        loaded_summary.html(i18n.x_of_y(total_loaded, total_events));
-
-        if(more_size > (total_events - total_loaded)) {
-           more_size = total_events - total_loaded;
-        }
-        more_button.text(i18n.x_more(more_size));
-    };
-    return {
-        initEvents: initEvents
-    };
-})();
-
-$(document).ready(function() {
-    KT.events.initEvents();
-});
diff --git a/app/assets/javascripts/katello/system_groups/index.js b/app/assets/javascripts/katello/system_groups/index.js
deleted file mode 100644
index ba9e4dc8204..00000000000
--- a/app/assets/javascripts/katello/system_groups/index.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- Copyright 2013 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-
-//= require "katello/system_groups/system_groups"
-//= require "katello/system_groups/system_group_events"
-//= require "katello/systems/system_errata"
-//= require "katello/systems/packages"
-//= require "katello/system_groups/package_actions"
-//= require "katello/widgets/auto_complete"
diff --git a/app/assets/javascripts/katello/system_groups/package_actions.js b/app/assets/javascripts/katello/system_groups/package_actions.js
deleted file mode 100644
index a34401cc66d..00000000000
--- a/app/assets/javascripts/katello/system_groups/package_actions.js
+++ /dev/null
@@ -1,316 +0,0 @@
-/**
- Copyright 2013 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-
-KT.package_action_types = (function() {
-    return {
-        PKG : "pkg",
-        PKG_INSTALL : "pkg_install",
-        PKG_UPDATE : "pkg_update",
-        PKG_REMOVE : "pkg_remove",
-        PKG_GRP : "pkg_grp",
-        PKG_GRP_INSTALL : "pkg_grp_install",
-        PKG_GRP_UPDATE : "pkg_grp_update",
-        PKG_GRP_REMOVE : "pkg_grp_remove"
-    };
-})();
-
-KT.package_actions = (function() {
-    var packages_container,
-    content_add_url,
-    content_update_url,
-    content_remove_url,
-    status_url,
-    packages_top,
-    content_form,
-    content_input,
-    add_content_button,
-    update_content_button,
-    update_all_content_button,
-    remove_content_button,
-    error_message,
-    add_row_shading = true,
-    actions_updater,
-    actions_updater_running = false,
-
-    init = function(editable, page) {
-        packages_container = $('#packages_container');
-        packages_top = $('.packages').find('tbody');
-        content_form = $('#content_form');
-        content_input = $('#content_input');
-        add_content_button = $('#add_content');
-        update_content_button = $('#update_content');
-        update_all_content_button = $('#update_all_content');
-        remove_content_button = $('#remove_content');
-        error_message = $('#error_message');
-
-        // This component could be shared by multiple pages (e.g. systems & system groups); however, some of the
-        // behavior is different depending on the page.  For example, the URLs to interact with the server.
-        packages_for = page;
-        var id = packages_container.data('parent_id');
-        if (packages_for === 'system') {
-            // TODO: update for system packages when it is used
-            var todo = 1;
-        } else {
-            // packages_for === 'system_group'
-            content_add_url = KT.routes.add_system_group_packages_path(id);
-            content_update_url = KT.routes.system_group_packages_path(id);
-            content_remove_url = KT.routes.remove_system_group_packages_path(id);
-            status_url = KT.routes.status_system_group_packages_path(id);
-        }
-
-        disableContentButtons();
-        enableUpdateAll();
-
-        content_input.bind('change, keyup', refreshButtons);
-        content_input.bind('keypress', function(event) {
-            // if the user presses enter, ignore it... do not submit the form...
-            if( event.which === 13) {
-                event.preventDefault();
-            }
-        });
-
-        $('.perform_action').change(refreshButtons);
-        KT.tipsy.custom.system_packages_tooltips();
-    },
-    refreshButtons = function() {
-        if (content_input.val().length === 0) {
-            disableContentButtons();
-
-            var selected_action = $("input[name=perform_action]:checked").attr('id');
-            if (selected_action === 'perform_action_packages') {
-                enableUpdateAll();
-            } else {  // perform_action_package_groups
-                disableUpdateAll();
-            }
-
-        } else {
-            disableUpdateAll();
-            enableContentButtons();
-        }
-    },
-    disableContentButtons = function() {
-        add_content_button.unbind().attr('disabled', 'disabled').addClass('disabled');
-        update_content_button.unbind().attr('disabled', 'disabled').addClass('disabled');
-        remove_content_button.unbind().attr('disabled', 'disabled').addClass('disabled');
-    },
-    enableContentButtons = function() {
-        if (add_content_button.hasClass('disabled')) {
-            add_content_button.unbind().bind('click', addContent).removeAttr('disabled').removeClass('disabled');
-            add_content_button.bind('keypress', function(event) {
-                if( event.which === 13) {
-                    event.preventDefault();
-                    KT.package_actions.addContent(event);
-                }
-            });
-        }
-
-        if (update_content_button.hasClass('disabled')) {
-            update_content_button.unbind().bind('click', updateContent).removeAttr('disabled').removeClass('disabled');
-            update_content_button.bind('keypress', function(event) {
-                if( event.which === 13) {
-                    event.preventDefault();
-                    KT.package_actions.updateContent(event);
-                }
-            });
-        }
-
-        if (remove_content_button.hasClass('disabled')) {
-            remove_content_button.unbind().bind('click', removeContent).removeAttr('disabled').removeClass('disabled');
-            remove_content_button.bind('keypress', function(event) {
-                if( event.which === 13) {
-                    event.preventDefault();
-                    KT.package_actions.removeContent(event);
-                }
-            });
-        }
-    },
-    enableUpdateAll = function() {
-        update_all_content_button.unbind().bind('click', updateContent).removeAttr('disabled').removeClass('disabled');
-        update_all_content_button.bind('keypress', function(event) {
-            if( event.which === 13) {
-                event.preventDefault();
-                KT.package_actions.updateContent(event);
-            }
-        });
-    },
-    disableUpdateAll = function() {
-        update_all_content_button.unbind().attr('disabled', 'disabled').addClass('disabled');
-    },
-    addContent = function(data) {
-        data.preventDefault();
-        performAction(content_add_url);
-    },
-    updateContent = function(data) {
-        data.preventDefault();
-        performAction(content_update_url);
-    },
-    removeContent = function(data) {
-        data.preventDefault();
-        performAction(content_remove_url);
-    },
-    performAction = function(url) {
-        var selected_action = $("input[name=perform_action]:checked").attr('id'),
-            content_string = content_form.find('#content_input').val(),
-            content_array = content_string.split(/ *, */),
-            content,
-            validation_error;
-
-        if (selected_action === 'perform_action_packages') {
-            validation_error = validate_action_requested(content_array, KT.package_action_types.PKG);
-            content = {'packages':content_string};
-        } else {
-            // perform_action_package_groups
-            validation_error = validate_action_requested(content_array, KT.package_action_types.PKG_GRP);
-            content = {'groups':content_string};
-        }
-
-        if (validation_error === undefined) {
-            disableContentButtons();
-            disableUpdateAll();
-            $.ajax({
-                url: url,
-                type: 'PUT',
-                data: content,
-                cache: false,
-                success: function(data) {
-                    $(data).each( function(index, element) {
-                        // The response will have the html to be rendered for the action scheduled, which
-                        // includes 1 row for each package or group included in the action.
-                        if ($(element).is('tr')) {
-                            var name = $(element).find('td').data('name'),
-                                existing;
-
-                            // check to see if there was an previous/existing action for the package or group
-                            if ($(element).hasClass('package')) {
-                                existing = $("tr.package > td[data-name='"+name+"']");
-                            } else {
-                                existing = $("tr.group > td[data-name='"+name+"']");
-                            }
-
-                            if (existing.length > 0) {
-                                // there was an action, so just update the status on the existing row
-                                existing.next('td.status').replaceWith($(element).find('td.status'));
-                            } else {
-                                // there was no action, so render the new row
-                                if (add_row_shading) {
-                                    add_row_shading = false;
-                                    $(element).addClass('alt');
-                                } else {
-                                    add_row_shading = true;
-                                }
-                                packages_top.prepend(element);
-                            }
-                        }
-                    });
-                    refreshButtons();
-                    show_validation_error(false);
-                    startUpdater();  // ensure polling is enabled for updates on the action
-                },
-                error: function() {
-                    refreshButtons();
-                }
-            });
-        } else {
-            show_validation_error(true, validation_error);
-        }
-    },
-    validate_action_requested = function(content, content_type) {
-        // validate the action being requested and return a validation error, if an error is found
-        var validation_error;
-
-        // validate the package list format
-        if ((content_type === KT.package_action_types.PKG) && !KT.packages.valid_package_list_format(content)) {
-            validation_error = i18n.validation_error_name_format;
-
-        // validate that no actions pending on same package or group
-        } else {
-            var item;
-            $.each(content, function(index, content_item) {
-                var status;
-                item = $.trim(content_item);
-                switch (content_type) {
-                    case KT.package_action_types.PKG:
-                        // look for an existing node for the package, where there is an action pending
-                        status = $("tr.package > td[data-name='"+item+"'] + td.status[data-pending-action-id]");
-                        if (status.length > 0) {
-                            validation_error = i18n.validation_error_package_pending;
-                        }
-                        break;
-                    case KT.package_action_types.PKG_GRP:
-                        // look for an existing node for the group, where there is an action pending
-                        status = $("tr.group > td[data-name='"+item+"'] + td.status[data-pending-action-id]");
-                        if (status.length > 0) {
-                            validation_error = i18n.validation_error_group_pending;
-                        }
-                        break;
-                }
-            });
-        }
-        return validation_error;
-    },
-    show_validation_error = function(show, validation_error){
-        var input = content_form.find('#content_input');
-        if( show ){
-            input.addClass('validation_error_input');
-            error_message.html(validation_error);
-            error_message.show();
-        } else {
-            input.removeClass('validation_error_input');
-            error_message.hide();
-        }
-    },
-    startUpdater = function () {
-        if (!actions_updater_running) {
-            var timeout = 8000;
-
-            actions_updater = $.PeriodicalUpdater(status_url, {
-                method: 'get',
-                type: 'json',
-                data: function() {return {id: getActionsInProgress()};},
-                global: false,
-                minTimeout: timeout,
-                maxTimeout: timeout
-            }, updateStatus);
-
-            actions_updater_running = true;
-        }
-    },
-    updateStatus = function(data) {
-        // update the status for each action retrieved
-        $.each(data, function(index, status) {
-            var node = $('td.status[data-pending-action-id=' + status['id'] + ']');
-            if(node !== undefined) {
-                if (status['status_html'] !== undefined) {
-                    node.replaceWith(status['status_html']);
-                }
-            }
-        });
-        if (getActionsInProgress().length === 0) {
-            actions_updater.stop();
-            actions_updater_running = false;
-        }
-    },
-    getActionsInProgress = function() {
-        var pending_actions = [];
-        $('td.status[data-pending-action-id]').each(function(i, element) {
-            pending_actions[i] = $(element).data("pending-action-id");
-        });
-        return pending_actions;
-    };
-    return {
-        init: init,
-        addContent: addContent,
-        removeContent: removeContent,
-        updateContent: updateContent
-    };
-})();
diff --git a/app/assets/javascripts/katello/system_groups/system_group_events.js b/app/assets/javascripts/katello/system_groups/system_group_events.js
deleted file mode 100644
index 4c2961a8bab..00000000000
--- a/app/assets/javascripts/katello/system_groups/system_group_events.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- Copyright 2013 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-KT.system_group = KT.system_group || {};
-
-KT.system_group.events = (function (){
-    var init = function() {
-        KT.tipsy.custom.tooltip('.tipsy-icon.task-info');
-        KT.events.initEvents();
-    };
-    return {
-        init: init
-    };
-})();
\ No newline at end of file
diff --git a/app/assets/javascripts/katello/system_groups/system_groups.js b/app/assets/javascripts/katello/system_groups/system_groups.js
deleted file mode 100644
index b68d8f156c7..00000000000
--- a/app/assets/javascripts/katello/system_groups/system_groups.js
+++ /dev/null
@@ -1,445 +0,0 @@
-/**
- Copyright 2013 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-
-
-KT.panel.list.registerPage('system_groups', { create : 'new_system_group' });
-
-$(document).ready(function() {
-    KT.panel.set_expand_cb(function(){
-        var children = $('#panel .menu_parent');
-        $.each(children, function(i, item) {
-            KT.menu.hoverMenu(item, { top : '75px' });
-        });
-
-        KT.system_groups.initialize();
-        KT.system_groups.new_setup();
-        KT.system_groups.details_setup();
-        KT.system_groups.env_content_view_setup();
-        KT.system_groups.selected_systems_setup();
-    });
-});
-
-
-KT.sg_table = (function(){
-    var add_system = function(html){
-        var tbody =  $("#systems_table").find("tbody");
-        tbody.prepend(html);
-        tbody.find(".empty_row").hide();
-        recalc_rows();
-        KT.system_groups.refresh_list_item();
-    },
-    remove_system = function(ids){
-        var table = $("#systems_table"),
-            rows;
-        $.each(ids, function(index, value){
-            table.find("tr[data-id=" + value +"]").remove();
-        });
-        //show the empty message if there are no entries
-        rows = table.find('tbody').find('tr').not('.empty_row');
-        if(rows.length === 0){
-            table.find(".empty_row").show();
-        }
-        recalc_rows();
-        KT.system_groups.refresh_list_item();
-    },
-    recalc_rows = function(){
-        /*
-         * ensures that there are minimum number of rows in the table
-         * for aesthetics
-         */
-        var min_rows = 12,
-            tbody = $("#systems_table").find("tbody"),
-            rows,
-            missing;
-
-        tbody.find('.stub').remove();
-        rows = tbody.find('tr').not('.empty_row');
-        missing = min_rows - rows.length;
-        if (missing > 0){
-            for(var i = 0; i < missing; i += 1){
-                tbody.append("<tr class='stub'><td><br></td><td></td></tr>");
-            }
-        }
-        rows = tbody.find('tr').not('.empty_row').not('.stub');
-        var alt = 1;
-        rows.each(function(index, value){
-            if(alt % 2 === 0){
-                $(value).addClass('alt');
-            }
-            else {
-                $(value).removeClass('alt');
-            }
-            alt += 1;
-        });
-
-    };
-
-    return {
-        add_system: add_system,
-        remove_system: remove_system,
-        recalc_rows: recalc_rows
-    };
-}());
-
-KT.system_groups = (function(){
-    var current_system_input,
-        current_max_systems,
-        systems_deletable = false,
-        selected_systems,
-    refresh_list_item = function(){
-        var id = $('#system_group_id');
-        list.refresh(id.val(), id.data('ajax_url'));
-    },
-    quota_setup = function() {
-        // quota_setup is used for both the 'new' and 'edit' panes.  While the logic is nearly the same
-        // there are slight differences, since the 'edit' uses inline editing, but the 'new' does not.
-        var unlimited = '-1',
-            initial_max;
-
-        if ($('#system_group_new').length > 0) {
-            // user is creating a group
-            initial_max = $('#system_group_max_systems').val();
-        } else {
-            // user is editing a group
-            initial_max = $('#system_group_max_systems').html();
-        }
-        current_max_systems = initial_max.length === 0 ? unlimited : initial_max;
-
-        $('input.unlimited_members').unbind('click');
-        $('input.unlimited_members').bind('click', function(){
-            var max_systems_element = $('.limit'),
-                max_systems = $('#system_group_max_systems');
-
-            if($(this).is(":checked")){
-                // user checked unlimited
-                max_systems_element.hide();
-                max_systems.val(unlimited);
-
-                if (max_systems.hasClass('editable')) {
-                    // user is editing an existing group
-                    if (max_systems.val() !== current_max_systems) {
-                        // user has changed the value since toggling unlimited on/off/on, so send request to server to set max_systems to unlimited
-                        $.ajax({
-                            type: "PUT",
-                            url: max_systems.data("url"),
-                            data: {system_group:{max_systems:unlimited}},
-                            cache: false,
-                            success: function(data) {
-                                max_systems.html(i18n.clickToEdit); // reset the jeditable input
-                                current_max_systems = unlimited;
-                            },
-                            error: function() {
-                            }
-                        });
-                    }
-                }
-            } else {
-                // user unchecked unlimited
-                max_systems.val('');
-                max_systems_element.show();
-
-                if (max_systems.hasClass('editable')) {
-                    // user is editing an existing group, send a click event to jeditable to open, so the user doesn't need to
-                    max_systems.click();
-                }
-            }
-        });
-    },
-    initialize = function(){
-        $('.pane_action.remove').bind('click', prompt_to_destroy_group);
-    },
-    prompt_to_destroy_group = function(e) {
-        e.preventDefault();
-        KT.common.customConfirm({
-            message: i18n.delete_system_group_confirm,
-            yes_callback: function(){
-                if (systems_deletable) {
-                    // User selected "Yes", ask if they also want to delete the systems
-                    prompt_to_destroy_systems();
-                } else {
-                    // User selected "No", they only want to delete the group
-                    destroy_group();
-                }
-            }
-        });
-        return false;
-    },
-    prompt_to_destroy_systems = function() {
-        KT.common.customConfirm({
-            message: i18n.delete_systems_confirm,
-            warning_message: i18n.delete_systems_warning,
-            yes_callback: function(){
-                // User selected "Yes"
-                destroy_systems_and_group();
-            },
-            no_callback: function(){
-                // User selected "No"
-                destroy_group();
-            },
-            no_text: i18n.delete_system_group_continue,
-            include_cancel: true
-        });
-        return false;
-    },
-    destroy_systems_and_group = function() {
-        var id = $('#system_group_id').attr('name');
-        $.ajax({
-            type: "DELETE",
-            url: KT.routes.destroy_systems_system_group_path(id),
-            cache: false,
-            success: function(data) {
-                /*jslint evil: true */
-                eval(data);
-            }
-        });
-    },
-    destroy_group = function() {
-        var id = $('#system_group_id').attr('name');
-        $.ajax({
-            type: "DELETE",
-            url: KT.routes.system_group_path(id),
-            cache: false,
-            success: function(data) {
-                /*jslint evil: true */
-                eval(data);
-            }
-        });
-    },
-    new_setup = function(){
-        var pane = $("#system_group_new");
-        if (pane.length === 0){
-            return;
-        }
-        quota_setup();
-    },
-    details_setup = function(){
-        var pane = $("#system_group_edit");
-        if (pane.length === 0){
-            return;
-        }
-        pane.find(".edit_name").each(function(){
-            $(this).editable($(this).data("url"), {
-                type        :  'text',
-                width       :  250,
-                method      :  'PUT',
-                name        :  $(this).attr('name'),
-                cancel      :  i18n.cancel,
-                submit      :  i18n.save,
-                indicator   :  i18n.saving,
-                tooltip     :  i18n.clickToEdit,
-                placeholder :  i18n.clickToEdit,
-                submitdata  :  $.extend({ authenticity_token: AUTH_TOKEN }, KT.common.getSearchParams()),
-                onsuccess   :  refresh_list_item
-            });
-        });
-        pane.find(".edit_max_systems").each(function(){
-            $(this).editable($(this).data("url"), {
-                type        :  'text',
-                width       :  250,
-                method      :  'PUT',
-                name        :  $(this).attr('name'),
-                cancel      :  i18n.cancel,
-                submit      :  i18n.save,
-                indicator   :  i18n.saving,
-                tooltip     :  i18n.clickToEdit,
-                placeholder :  i18n.clickToEdit,
-                submitdata  :  $.extend({ authenticity_token: AUTH_TOKEN }, KT.common.getSearchParams()),
-                onsuccess   :  function(data){
-                    $(this).html(data);
-                    current_max_systems = data;
-                },
-                onresetcomplete :  function(settings, element){
-                    // This event is invoked on cancel, esc and click outside of the element.
-                    // When this occurs, if the user hasn't changed the value, reset to 'unlimited', hiding
-                    // the limit element.
-                    if ($(element).html() === i18n.clickToEdit) {
-                        $('.limit').hide();
-                        $('input.unlimited_members').attr('checked', 'checked');
-                    }
-                }
-            });
-        });
-        quota_setup();
-    },
-    systems_setup = function(systems_deletable_perm){
-        var pane = $("#system_group_systems");
-        if (pane.length === 0){
-            return;
-        }
-        systems_deletable = systems_deletable_perm;
-
-        KT.sg_table.recalc_rows();
-        $('#remove_systems').click(function(){
-            var sys_ids = $('.system_checkbox:checked').map(function(){
-                return $(this).data('id');
-            }).get();
-            if(sys_ids.length > 0){
-                remove_systems(sys_ids, $(this));
-            }
-        });
-
-        current_system_input = KT.auto_complete_box({
-            values:       KT.routes.auto_complete_systems_path(),
-            input_id:     "add_system_input",
-            form_id:      "system_form",
-            add_btn_id:   "add_system",
-            selected_input_id: 'add_system_input_id',
-            add_cb:       add_system
-        });
-
-        $("input.system_checkbox").unbind("change");
-        $("input.system_checkbox").change(function() {
-            var checked_systems = $("input.system_checkbox:checked");
-            if (checked_systems.length === 0) {
-                $("a.edit_systems").html(i18n.edit_all_systems);
-            }
-            else if (checked_systems.length > 0) {
-                $("a.edit_systems").html(i18n.edit_selected_systems);
-           }
-        });
-    },
-    selected_systems_setup = function() {
-        // This function will recheck any system checkboxes that were selected
-        // before the systems pane was reloaded.  This is to handle the case
-        // where user selects a group of systems, edits them and immediately
-        // is returned to the systems list.
-        var pane = $("#system_group_systems");
-        if (pane.length === 0){
-            return;
-        }
-        KT.utils.each(selected_systems, function(system) {
-            var system_id = $(system).data('id');
-            checkbox = $("input.system_checkbox[data-id=" + system_id + "]").prop('checked', true);
-        });
-        selected_systems = undefined;
-    },
-    add_system = function(string, item_id, cb){
-        var grp_id = $("#system_group_systems").data('id'),
-        add_funct = function(id){
-            if(id){
-                submit_change(grp_id, [id], true,
-                    function(content){
-                        KT.sg_table.add_system(content);
-                        $("#add_system_input").val('');
-                        cb();
-                    },
-                    function() {
-                        // error_cb - handle scenario where error is returned from the server during 'add'
-                        // reset the autocomplete input (e.g. remove the spinner, re-add add button..etc)
-                        current_system_input.reset_input();
-                        current_system_input.error();
-                        cb();
-                    });
-            }
-            else {
-                current_system_input.error();
-                cb();
-            }
-        };
-        if (item_id) {
-            add_funct(item_id);
-        }
-        else {
-            //User did not select from the list, so we must search
-            $.get(KT.routes.auto_complete_systems_path(), {term:string}, function(data){
-                var found = false;
-                $.each(data, function(index, element){
-                    if (element.value === string){
-                        found = element.id;
-
-                        return false;
-                    }
-                });
-                add_funct(found);
-            });
-        }
-
-    },
-    remove_systems = function(sys_ids, btn){
-        var grp_id = $("#system_group_systems").data('id'),
-            cleanup;
-
-        btn.attr('disabled', 'true');
-        $('.system_checkbox').attr('disabled', 'true');
-
-        cleanup = function(){
-            btn.removeAttr('disabled');
-            $('.system_checkbox').removeAttr('disabled');
-        };
-
-        submit_change(grp_id, sys_ids, false,
-            function(){
-                KT.sg_table.remove_system(sys_ids);
-                cleanup();
-            },
-            function(){
-                cleanup();
-            });
-    },
-    submit_change = function(grp_id, sys_ids, add, cb, error_cb){
-      var url = add ? KT.routes.add_systems_system_group_path(grp_id) :
-                        KT.routes.remove_systems_system_group_path(grp_id);
-      $.post(url, {'system_ids':sys_ids}, cb).error(error_cb);
-    },
-    env_content_view_setup = function(){
-        var pane = $(".env_content_view_selector");
-        if (pane.length === 0){
-            return;
-        }
-
-        KT.env_content_view_selector.initialize(
-            {
-                before_serialize_cb: add_selected_systems,
-                save_success_cb: updated_env_content_view,
-                override_save: true
-            }
-        );
-
-        $('#update_form').unbind('submit');
-        $('#update_form').submit(function(e) {
-            var form = $(this);
-            e.preventDefault();
-            KT.common.customConfirm({
-                message: i18n.change_systems_confirm,
-                yes_callback: function(){
-                    KT.env_content_view_selector.save(form);
-                }
-            });
-        });
-    },
-    add_selected_systems = function(form) {
-        // This will add the systems that are currently selected to the form provided.
-        var selected_systems = $("input.system_checkbox:checked").clone().removeClass('system_checkbox').addClass('hidden');
-        form.find('#content_view_id').after(selected_systems);
-        return true;
-    },
-    updated_env_content_view = function (){
-        // save the systems currently selected.  we'll use these to
-        // reselect the systems after the pane reloads
-        selected_systems = $("input.system_checkbox:checked");
-
-        KT.panel.panelAjax('', KT.routes.systems_system_group_path($('#system_group_systems').data('id')) ,$('#panel'), true);
-        KT.panel.closeSubPanel($('#subpanel'));
-    };
-
-    return {
-        initialize: initialize,
-        new_setup: new_setup,
-        details_setup: details_setup,
-        systems_setup: systems_setup,
-        selected_systems_setup: selected_systems_setup,
-        env_content_view_setup: env_content_view_setup,
-        add_system : add_system,
-        refresh_list_item: refresh_list_item
-    };
-})();
\ No newline at end of file
diff --git a/app/assets/javascripts/katello/system_groups/system_groups_pane.js b/app/assets/javascripts/katello/system_groups/system_groups_pane.js
deleted file mode 100644
index 17e9d9545f3..00000000000
--- a/app/assets/javascripts/katello/system_groups/system_groups_pane.js
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
- Copyright 2013 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
-
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-
-KT.system_groups_pane = (function() {
-    var system_groups = $("#system_groups"),
-        multiselect_widget,
-
-    add_groups = function(e){
-        var checked = $("#system_group").multiselect("getChecked"),
-            group_ids = checked.map(function(){return this.value;}).get();
-
-        e.preventDefault();
-        disable_inputs();
-
-        $.ajax({
-            type: "PUT",
-            url: $("input#add_groups").data("url"),
-            data: {group_ids:group_ids},
-            cache: false,
-            success: function(data) {
-
-                // for each group that was added to the system, remove it from the multiselect
-                checked.each(function(index, item){
-                    var v = $(item).val(),
-                        opt = $('option[value="'+v+'"]');
-
-                    opt.remove();
-                    multiselect_widget.multiselect('refresh');
-
-                });
-
-                // The response will include a block of html representing the list of groups successfully added.
-                // Add that response to the top of the table.
-                $("tr#empty_row").hide();
-                $("tr#add_groups").after(data);
-
-                enable_inputs();
-                update_remove();
-            },
-            error: function() {
-                enable_inputs();
-            }
-        });
-    },
-    remove_groups = function() {
-        var btn = $("input#remove_groups"),
-            groups = [],
-            checked = $("input.group_select:checked");
-
-        checked.each(function(index, item){
-            groups.push($(item).val());
-        });
-        if (groups.length === 0){
-            return;
-        }
-        disable_inputs();
-
-        $.ajax({
-            type: "PUT",
-            url: btn.data("url"),
-            data: {group_ids:groups},
-            cache: false,
-            success: function(data) {
-                // for each group that was removed from the system, add it to the multiselect
-                checked.each(function(index, item){
-                    var v = $(item).val(),
-                        t = $(item).attr('name'),
-                        opt = $('<option />', {value: v, text: t});
-
-                    opt.appendTo(multiselect_widget);
-                    multiselect_widget.multiselect('refresh');
-                });
-
-                checked.parents("tr").remove();
-                if ($("input.group_select").length === 0) {
-                    $("tr#empty_row").show();
-                }
-                enable_inputs();
-                update_remove();
-            },
-            error: function() {
-                enable_inputs();
-            }
-        });
-    },
-    disable_inputs = function(){
-        $("input#add_groups").attr("disabled", true);
-        disable_remove();
-        $("input.group_select").attr("disabled", true);
-        $("#system_group").multiselect('disable');
-    },
-    enable_inputs = function(){
-        $("input#add_groups").removeAttr("disabled");
-        enable_remove();
-        $("input.group_select").removeAttr("disabled");
-        $("#system_group").multiselect('enable');
-    },
-    disable_remove = function() {
-        $("input#remove_groups").attr("disabled", true);
-    },
-    enable_remove = function() {
-        $("input#remove_groups").removeAttr("disabled");
-    },
-    update_remove = function() {
-        if ($('.group_select[type="checkbox"]:checked').length > 0) {
-            enable_remove();
-        } else {
-            disable_remove();
-        }
-    },
-    register_events = function() {
-        $("input#add_groups").live('click', add_groups);
-        $("input#remove_groups").live('click', remove_groups);
-    },
-    register_multiselect = function() {
-        multiselect_widget = $("#system_group").multiselect({
-            noneSelectedText: i18n.select_system_groups,
-            selectedList: 4
-        }).multiselectfilter();
-
-        disable_remove();
-        $('.group_select[type="checkbox"]').live('change', update_remove);
-    };
-    return {
-        add_groups: add_groups,
-        remove_groups: remove_groups,
-        register_events: register_events,
-        register_multiselect: register_multiselect
-    };
-})();
diff --git a/app/assets/javascripts/katello/system_packages/index.js b/app/assets/javascripts/katello/system_packages/index.js
deleted file mode 100644
index ea64467630f..00000000000
--- a/app/assets/javascripts/katello/system_packages/index.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- Copyright 2013 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-
-//= require "alchemy/jquery/plugins/jquery.uitablefilter"
-//= require "katello/system_packages/packages_filtertable"
-//= require "katello/system_packages/system_packages"
diff --git a/app/assets/javascripts/katello/system_packages/packages_filtertable.js b/app/assets/javascripts/katello/system_packages/packages_filtertable.js
deleted file mode 100644
index 8ad6e198af1..00000000000
--- a/app/assets/javascripts/katello/system_packages/packages_filtertable.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- Copyright 2013 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-
-KT.packages_filtertable = (function() {
-    var initialize = function() {
-        var theTable = $('table.filter_table.packages');
-        var filter = $('#filter');
-        var load_more = $('a#more');
-        var load_summary = $('span#loaded_summary');
-        var count = theTable.attr('data-packageCount', 25);
-
-        theTable.find('tbody tr:visible:odd').addClass('alt');
-
-        filter.live('change, keyup', function(){
-            if ( !this.value ){
-                count = theTable.attr('data-packageCount');
-                theTable.find('tbody tr').hide();
-                theTable.find('tbody tr:lt('+count+')').show();
-                coloring();
-                footer("visible");
-            } else {
-                $.uiTableFilter(theTable, this.value);
-                coloring();
-                footer("hidden");
-            }
-
-            function coloring(){
-                theTable.find('tbody tr').removeClass('alt');
-                theTable.find('tbody tr:visible:odd').addClass('alt');
-            }
-            function footer(method){
-                load_more.css('visibility',method);
-                load_summary.css('visibility',method);
-            }
-        });
-
-        //override the submit so it doesn't try to push a form
-        $('#filter_form').submit(function () {
-            filter.keyup();
-            return false;
-        }).focus(); //Give focus to input field
-        $('.filter_button').click(function(){filter.change()});
-    };
-    return {
-        initialize: initialize
-    };
-}(jQuery));
-
-$(document).ready(function() {
-    // initialize the filter table
-    KT.packages_filtertable.initialize();
-    //packages_filtertable.initialize();
-});
diff --git a/app/assets/javascripts/katello/system_packages/system_packages.js b/app/assets/javascripts/katello/system_packages/system_packages.js
deleted file mode 100644
index 7ff2b73e1ed..00000000000
--- a/app/assets/javascripts/katello/system_packages/system_packages.js
+++ /dev/null
@@ -1,767 +0,0 @@
-/**
- Copyright 2013 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-/**
- * Created by .
- * User: jrist
- * Date: 7/13/11
- * Time: 2:27 PM
- *
- * This file is for use with the packages subnav within systems page.
- */
-
-/*jshint loopfunc: true */
-
-KT.package_action_types = (function() {
-    return {
-        PKG : "pkg",
-        PKG_INSTALL : "pkg_install",
-        PKG_UPDATE : "pkg_update",
-        PKG_REMOVE : "pkg_remove",
-        PKG_GRP : "pkg_grp",
-        PKG_GRP_INSTALL : "pkg_grp_install",
-        PKG_GRP_UPDATE : "pkg_grp_update",
-        PKG_GRP_REMOVE : "pkg_grp_remove"
-    };
-})();
-
-KT.system_packages = (function() {
-    var system_id = $('.packages').attr('data-system_id'),
-    retrievingNewContent = true,
-    total_packages = $('.packages').attr('data-total_packages'),
-    more_button = $('#more'),
-    sort_button = $('#package_sort'),
-    packages_form = $('#packages_form'),
-    packages_top = $('.packages').find('tbody'),
-    remove_button = $('#remove_packages'),
-    update_button = $('#update_packages'),
-    update_all_button = $('#update_all_packages'),
-    packages_tabindex = $('input[type="checkbox"]').last().attr('tabindex'),
-    content_form = $('#content_form'),
-    content_input = $('#content_input'),
-    add_content_button = $('#add_content'),
-    remove_content_button = $('#remove_content'),
-    loaded_summary = $('#loaded_summary'),
-    error_message = $('#error_message'),
-    add_row_shading = true,
-    selected_checkboxes = 0,
-    actions_in_progress = {},
-    packages_in_progress = {},
-    groups_in_progress = {},
-    actions_updater,
-
-    disableButtons = function() {
-        remove_button.attr('disabled', 'disabled');
-        update_button.attr('disabled', 'disabled');
-
-        remove_button.addClass('disabled');
-        update_button.addClass('disabled');
-    },
-    enableButtons = function() {
-        remove_button.removeAttr('disabled');
-        update_button.removeAttr('disabled');
-
-        remove_button.removeClass('disabled');
-        update_button.removeClass('disabled');
-    },
-    disableUpdateAll = function() {
-        update_all_button.attr('disabled', 'disabled');
-        update_all_button.addClass('disabled');
-    },
-    enableUpdateAll = function() {
-        update_all_button.removeAttr('disabled');
-        update_all_button.removeClass('disabled');
-    },
-    disableLinks = function() {
-        add_content_button.unbind();
-        remove_content_button.unbind();
-
-        add_content_button.attr('disabled', 'disabled');
-        remove_content_button.attr('disabled', 'disabled');
-
-        add_content_button.addClass('disabled');
-        remove_content_button.addClass('disabled');
-    },
-    enableLinks = function() {
-        if (add_content_button.hasClass('disabled')) {
-            add_content_button.bind('click', addContent);
-            add_content_button.bind('keypress', function(event) {
-                if( event.which === 13) {
-                    event.preventDefault();
-                    KT.system_packages.addContent(event);
-                }
-            });
-
-            add_content_button.removeAttr('disabled');
-            add_content_button.removeClass('disabled');
-        }
-        if (remove_content_button.hasClass('disabled')) {
-            remove_content_button.bind('click', removeContent);
-            remove_content_button.bind('keypress', function(event) {
-                if( event.which === 13) {
-                    event.preventDefault();
-                    KT.system_packages.removeContent(event);
-                }
-            });
-            remove_content_button.removeAttr('disabled');
-            remove_content_button.removeClass('disabled');
-        }
-    },
-    getActionType = function(item) {
-        var action_type;
-
-        if (item.find('td.package_action_status:contains("'+i18n.adding_package+'")').length > 0) {
-            action_type = KT.package_action_types.PKG_INSTALL;
-        } else if (item.find('td.package_action_status:contains("'+i18n.updating_package+'")').length > 0) {
-            action_type = KT.package_action_types.PKG_UPDATE;
-        } else if (item.find('td.package_action_status:contains("'+i18n.removing_package+'")').length > 0) {
-            action_type = KT.package_action_types.PKG_REMOVE;
-        } else if (item.find('td.package_action_status:contains("'+i18n.adding_group+'")').length > 0) {
-            action_type = KT.package_action_types.PKG_GRP_INSTALL;
-        } else if (item.find('td.package_action_status:contains("'+i18n.removing_group+'")').length > 0) {
-            action_type = KT.package_action_types.PKG_GRP_REMOVE;
-        }
-
-        return action_type;
-    },
-    morePackages = function() {
-        var list = $('table.packages');
-        var currentCount = list.attr('data-packageCount');
-        var newCount = Number(currentCount) + Number(25);
-
-        list.find('tbody tr').hide();
-        list.find('tbody tr:lt('+newCount+')').show();
-        list.find('tbody tr:visible').removeClass('alt');
-        list.find('tbody tr:visible:odd').addClass('alt');
-
-        list.attr('data-packageCount', newCount);
-
-        updateLoadedSummary();
-        registerCheckboxEvents();
-    },
-    sortOrder = function() {
-        var packageSortOrder = sort_button.attr("data-sort");
-        if (sort_button.attr("data-sort") === "asc"){
-            packageSortOrder = "desc";
-            sort_button.removeClass("ascending").addClass("descending");
-        } else {
-            packageSortOrder = "asc";
-            sort_button.removeClass("descending").addClass("ascending");
-        }
-        sort_button.attr("data-sort", packageSortOrder);
-        return packageSortOrder;
-    },
-    reverseSort = function() {
-        var list = $('.packages');
-        var spinner = $('#list-spinner');
-        var dataScrollURL = more_button.attr("data-scroll_url");
-        var reverse = parseInt(more_button.attr("data-offset"), 10);
-
-        dataScrollURL = dataScrollURL + "?reverse=" + reverse + "&pkg_order=" + KT.system_packages.sortOrder() + "&";
-        spinner.fadeIn();
-        list.find('tbody > tr.package').empty().remove();
-        $.ajax({
-            type: "GET",
-            url: dataScrollURL,
-            cache: false,
-            success: function(data) {
-                retrievingNewContent = false;
-                spinner.fadeOut();
-                list.append(data);
-                registerCheckboxEvents();
-                $('#filter').keyup();
-                $('.scroll-pane').jScrollPane().data('jsp').reinitialise();
-                if (data.length === 0) {
-                    more_button.empty().remove();
-                }else{
-                    more_button.attr("data-offset", reverse);
-                }
-            },
-            error: function() {
-                spinner.fadeOut();
-                retrievingNewContent = false;
-            }
-        });
-    },
-    registerCheckboxEvents = function() {
-        var checkboxes = $('input[type="checkbox"]');
-
-        checkboxes.unbind('change');
-        checkboxes.each(function(){
-            $(this).change(function(){
-                if($(this).is(":checked")){
-                    selected_checkboxes += 1;
-                    enableButtons();
-                    disableUpdateAll();
-                }else{
-                    selected_checkboxes -= 1;
-                    if(selected_checkboxes === 0){
-                        disableButtons();
-                        enableUpdateAll();
-                    }
-                }
-            });
-        });
-    },
-    updateStatus = function(data) {
-        // For each action that the user has initiated, update the status.
-        $.each(data, function(index, status) {
-            var event_id = status["id"],
-                action = actions_in_progress[event_id],
-                action_row = $('tr[data-pending-action-id="'+event_id+'"]'),
-                action_status_col = action_row.find('td.package_action_status');
-
-            switch (status["overall_status"]) {
-                case "waiting":
-                case "running":
-                    // do nothing, no change to status needed
-                    break;
-                case "error":
-                    switch (action) {
-                        case KT.package_action_types.PKG_INSTALL:
-                            action_status_col.html(get_status_block(event_id, i18n.adding_package_failed));
-                            clearAction(status["id"], status["parameters"], KT.package_action_types.PKG);
-                            break;
-                        case KT.package_action_types.PKG_UPDATE:
-                            action_status_col.html(get_status_block(event_id, i18n.updating_package_failed));
-                            clearAction(status["id"], status["parameters"], KT.package_action_types.PKG);
-                            break;
-                        case KT.package_action_types.PKG_REMOVE:
-                            action_status_col.html(get_status_block(event_id, i18n.removing_package_failed));
-                            clearAction(status["id"], status["parameters"], KT.package_action_types.PKG);
-                            break;
-                        case KT.package_action_types.PKG_GRP_INSTALL:
-                            action_status_col.html(get_status_block(event_id, i18n.adding_group_failed));
-                            clearAction(status["id"], status["parameters"], KT.package_action_types.PKG_GRP);
-                            break;
-                        case KT.package_action_types.PKG_GRP_REMOVE:
-                            action_status_col.html(get_status_block(event_id, i18n.removing_group_failed));
-                            clearAction(status["id"], status["parameters"], KT.package_action_types.PKG_GRP);
-                            break;
-                    }
-                    break;
-                case "finished":
-                    switch (action) {
-                        case KT.package_action_types.PKG_INSTALL:
-                            action_status_col.html(get_status_block(event_id, i18n.adding_package_success));
-                            clearAction(status["id"], status["parameters"], KT.package_action_types.PKG);
-                            break;
-                        case KT.package_action_types.PKG_UPDATE:
-                            action_status_col.html(get_status_block(event_id, i18n.updating_package_success));
-                            clearAction(status["id"], status["parameters"], KT.package_action_types.PKG);
-                            break;
-                        case KT.package_action_types.PKG_REMOVE:
-                            action_status_col.html(get_status_block(event_id, i18n.removing_package_success));
-                            clearAction(status["id"], status["parameters"], KT.package_action_types.PKG);
-                            break;
-                        case KT.package_action_types.PKG_GRP_INSTALL:
-                            action_status_col.html(get_status_block(event_id, i18n.adding_group_success));
-                            clearAction(status["id"], status["parameters"], KT.package_action_types.PKG_GRP);
-                            break;
-                        case KT.package_action_types.PKG_GRP_REMOVE:
-                            action_status_col.html(get_status_block(event_id, i18n.removing_group_success));
-                            clearAction(status["id"], status["parameters"], KT.package_action_types.PKG_GRP);
-                            break;
-                    }
-                    break;
-                case "canceled":
-                    switch (action) {
-                        case KT.package_action_types.PKG_INSTALL:
-                            action_status_col.html(get_status_block(event_id, i18n.adding_package_canceled));
-                            clearAction(status["id"], status["parameters"], KT.package_action_types.PKG);
-                            break;
-                        case KT.package_action_types.PKG_UPDATE:
-                            action_status_col.html(get_status_block(event_id, i18n.updating_package_canceled));
-                            clearAction(status["id"], status["parameters"], KT.package_action_types.PKG);
-                            break;
-                        case KT.package_action_types.PKG_REMOVE:
-                            action_status_col.html(get_status_block(event_id, i18n.removing_package_canceled));
-                            clearAction(status["id"], status["parameters"], KT.package_action_types.PKG);
-                            break;
-                        case KT.package_action_types.PKG_GRP_INSTALL:
-                            action_status_col.html(get_status_block(event_id, i18n.adding_group_canceled));
-                            clearAction(status["id"], status["parameters"], KT.package_action_types.PKG_GRP);
-                            break;
-                        case KT.package_action_types.PKG_GRP_REMOVE:
-                            action_status_col.html(get_status_block(event_id, i18n.removing_group_canceled));
-                            clearAction(status["id"], status["parameters"], KT.package_action_types.PKG_GRP);
-                            break;
-                    }
-                    break;
-                case "timed_out":
-                    switch (action) {
-                        case KT.package_action_types.PKG_INSTALL:
-                            action_status_col.html(get_status_block(event_id, i18n.adding_package_timeout));
-                            clearAction(status["id"], status["parameters"], KT.package_action_types.PKG);
-                            break;
-                        case KT.package_action_types.PKG_UPDATE:
-                            action_status_col.html(get_status_block(event_id, i18n.updating_package_timeout));
-                            clearAction(status["id"], status["parameters"], KT.package_action_types.PKG);
-                            break;
-                        case KT.package_action_types.PKG_REMOVE:
-                            action_status_col.html(get_status_block(event_id, i18n.removing_package_timeout));
-                            clearAction(status["id"], status["parameters"], KT.package_action_types.PKG);
-                            break;
-                        case KT.package_action_types.PKG_GRP_INSTALL:
-                            action_status_col.html(get_status_block(event_id, i18n.adding_group_timeout));
-                            clearAction(status["id"], status["parameters"], KT.package_action_types.PKG_GRP);
-                            break;
-                        case KT.package_action_types.PKG_GRP_REMOVE:
-                            action_status_col.html(get_status_block(event_id, i18n.removing_group_timeout));
-                            clearAction(status["id"], status["parameters"], KT.package_action_types.PKG_GRP);
-                            break;
-                    }
-                    break;
-            }
-        });
-    },
-    get_status_block = function(event_id, status){
-        var event_url = KT.routes.system_event_path(system_id, event_id);
-
-        var html = '<a data-url="' + event_url + '" class="subpanel_element">' + status + '</a>';
-        return html;
-    },
-    clearAction = function(action_id, content, content_type) {
-        // clear/remove the details associated with the action....
-        noLongerMonitorStatus(action_id);
-
-        // clear the package and group names associated with the action
-        $.each(content, function(index, content_item) {
-            var names = content_item.toString().split(',');
-            $.each(names, function(index, name) {
-                if (content_type === KT.package_action_types.PKG) {
-                    delete packages_in_progress[name];
-                } else if (content_type === KT.package_action_types.PKG_GRP) {
-                    delete groups_in_progress[name];
-                }
-            });
-        });
-    },
-    startUpdater = function () {
-        var timeout = 8000;
-        actions_updater = $.PeriodicalUpdater(KT.routes.status_system_system_packages_path(system_id), {
-            method: 'get',
-            type: 'json',
-            data: function() {return {id: Object.keys(actions_in_progress)};},
-            global: false,
-            minTimeout: timeout,
-            maxTimeout: timeout
-        }, updateStatus);
-    },
-    monitorStatus = function(task_id, task_type) {
-        actions_in_progress[task_id] = task_type;
-
-        if (actions_updater === undefined){
-            startUpdater();
-        } else {
-            actions_updater.restart();
-        }
-    },
-    noLongerMonitorStatus = function(task_id) {
-        delete actions_in_progress[task_id];
-
-        if (Object.keys(actions_in_progress).length === 0) {
-            actions_updater.stop();
-        }
-    },
-    initPackages = function() {
-        initProgress();
-        registerEvents();
-        disableButtons();
-        enableUpdateAll();
-        updateLoadedSummary();
-    },
-    initProgress = function() {
-        // when the page loads, we need to initialize the 'in progress' structures, to support monitoring
-        // the status of any actions currently in progress...
-
-        // if we are currently polling for status, temporarily stop the updater while we initialize the structures
-        if (actions_updater !== undefined) {
-            actions_updater.stop();
-        }
-
-        $('tr.content_package').each( function() {
-            actions_in_progress[$(this).attr('data-pending-action-id')] = getActionType($(this));
-            packages_in_progress[$.trim($(this).find('td.package_name').html())] = true;
-        });
-        $('tr.content_group').each( function() {
-            actions_in_progress[$(this).attr('data-pending-action-id')] = getActionType($(this));
-            packages_in_progress[$.trim($(this).find('td.package_name').html())] = true;
-        });
-
-        // start the updater, if there are any actions in progress
-        if (Object.keys(actions_in_progress).length > 0) {
-            if (actions_updater === undefined){
-                startUpdater();
-            } else {
-                actions_updater.restart();
-            }
-        }
-    },
-    registerEvents = function() {
-        content_input.bind('change, keyup', updateContentLinks);
-        content_input.bind('keypress', function(event) {
-            // if the user presses enter, ignore it... do not submit the form...
-            if( event.which === 13) {
-                event.preventDefault();
-            }
-        });
-        more_button.bind('click', morePackages);
-        more_button.bind('keypress', function(event) {
-            if( event.which === 13) {
-                event.preventDefault();
-                morePackages();
-            }
-        });
-
-        sort_button.bind('click', reverseSort);
-        remove_button.bind('click', removePackages);
-        update_button.bind('click', updatePackages);
-        update_all_button.bind('click', updateAllPackages);
-
-        KT.tipsy.custom.system_packages_tooltips();
-        registerCheckboxEvents();
-    },
-    updateContentLinks = function(data) {
-        if ($.trim($(this).val()).length === 0) {
-            // the user cleared the content box, so disable the add/remove links
-            disableLinks();
-
-        } else {
-            // the user has entered content in the content box, so enable the add/remove links
-            enableLinks();
-        }
-    },
-    addContent = function(data) {
-        data.preventDefault();
-
-        var selected_action = $("input[name=perform_action]:checked").attr('id'),
-            content_string = content_form.find('#content_input').val(),
-            content_array = content_string.split(/ *, */),
-            validation_error;
-
-        if (selected_action === 'perform_action_packages') {
-            validation_error = validate_action_requested(content_array, KT.package_action_types.PKG);
-            if (validation_error === undefined) {
-                disableLinks();
-                $.ajax({
-                    url: KT.routes.add_system_system_packages_path(system_id),
-                    type: 'PUT',
-                    data: {'packages' : content_string},
-                    cache: false,
-                    success: function(data) {
-                        monitorStatus(data, KT.package_action_types.PKG_INSTALL);
-
-                        for (var i = 0; i < content_array.length; i += 1) {
-                            var pkg_name = $.trim(content_array[i]), already_exists = false;
-                            packages_in_progress[pkg_name] = true;
-
-                            $('tr.content_package').find('td.package_name').each( function() {
-                                if ($.trim($(this).html()) === pkg_name) {
-                                    already_exists = true;
-                                    $(this).parent().attr('data-pending-action-id', data);
-                                    $(this).parent().find('td.package_action_status').html('<img style="padding-right:8px;" src="icons/spinner.gif">' + i18n.adding_package);
-                                }
-                            });
-                            // if row already existed... skip...
-                            if (already_exists === false) {
-                                if (add_row_shading) {
-                                    add_row_shading = false;
-                                    packages_top.prepend('<tr class="alt content_package" data-pending-action-id='+data+'><td></td><td class="package_name">' + pkg_name + '</td><td class="package_action_status"><img style="padding-right:8px;" src="icons/spinner.gif">' + i18n.adding_package + '</td></tr>');
-                                } else {
-                                    add_row_shading = true;
-                                    packages_top.prepend('<tr class="content_package" data-pending-action-id='+data+'><td></td><td class="package_name">' + pkg_name + '</td><td class="package_action_status"><img style="padding-right:8px;" src="icons/spinner.gif">' + i18n.adding_package + '</td></tr>');
-                                }
-                            }
-                        }
-                        enableLinks();
-                        show_validation_error(false);
-                    },
-                    error: function() {
-                        enableLinks();
-                    }
-                });
-            } else {
-                show_validation_error(true, validation_error);
-            }
-        } else {
-            validation_error = validate_action_requested(content_array, KT.package_action_types.PKG_GRP);
-            if (validation_error === undefined) {
-                disableLinks();
-                $.ajax({
-                    url: KT.routes.add_system_system_packages_path(system_id),
-                    type: 'PUT',
-                    data: {'groups' : content_string},
-                    cache: false,
-                    success: function(data) {
-                        monitorStatus(data, KT.package_action_types.PKG_GRP_INSTALL);
-
-                        for (var i = 0; i < content_array.length; i += 1) {
-                            var group_name = $.trim(content_array[i]), already_exists = false;
-                            groups_in_progress[group_name] = true;
-
-                            $('tr.content_group').find('td.package_name').each( function() {
-                                if ($.trim($(this).html()) === group_name) {
-                                    already_exists = true;
-                                    $(this).parent().attr('data-pending-action-id', data);
-                                    $(this).parent().find('td.package_action_status').html('<img style="padding-right:8px;" src="icons/spinner.gif">' + i18n.adding_group);
-                                }
-                            });
-                            // if row already existed... skip...
-                            if (already_exists === false) {
-                                if (add_row_shading) {
-                                    add_row_shading = false;
-                                    packages_top.prepend('<tr class="alt content_group" data-pending-action-id='+data+'><td></td><td class="package_name">' + group_name + '</td><td class="package_action_status"><img style="padding-right:8px;" src="icons/spinner.gif">' + i18n.adding_group + '</td></tr>');
-                                } else {
-                                    add_row_shading = true;
-                                    packages_top.prepend('<tr class="content_group" data-pending-action-id='+data+'><td></td><td class="package_name">' + group_name + '</td><td class="package_action_status"><img style="padding-right:8px;" src="icons/spinner.gif">' + i18n.adding_group + '</td></tr>');
-                                }
-                            }
-                        }
-                        enableLinks();
-                        show_validation_error(false);
-                    },
-                    error: function() {
-                        enableLinks();
-                    }
-                });
-            } else {
-                show_validation_error(true, validation_error);
-            }
-        }
-    },
-    removeContent = function(data) {
-        data.preventDefault();
-
-        var selected_action = $("input[name=perform_action]:checked").attr('id'),
-            content_string = content_form.find('#content_input').val(),
-            content_array = content_string.split(/ *, */),
-            validation_error;
-
-        if (selected_action === 'perform_action_packages') {
-            validation_error = validate_action_requested(content_array, KT.package_action_types.PKG);
-            if (validation_error === undefined) {
-                disableLinks();
-                $.ajax({
-                    url: KT.routes.remove_system_system_packages_path(system_id),
-                    type: 'POST',
-                    data: {'packages' : content_string},
-                    cache: false,
-                    success: function(data) {
-                        monitorStatus(data, KT.package_action_types.PKG_REMOVE);
-
-                        for (var i = 0; i < content_array.length; i += 1) {
-                            var pkg_name = $.trim(content_array[i]), already_exists = false;
-                            packages_in_progress[pkg_name] = true;
-
-                            $('tr.content_package').find('td.package_name').each( function() {
-                                if ($.trim($(this).html()) === pkg_name) {
-                                    already_exists = true;
-                                    $(this).parent().attr('data-pending-action-id', data);
-                                    $(this).parent().find('td.package_action_status').html('<img style="padding-right:8px;" src="icons/spinner.gif">' + i18n.removing_package);
-                                }
-                            });
-                            // if row already existed... skip...
-                            if (already_exists === false) {
-                                if (add_row_shading) {
-                                    add_row_shading = false;
-                                    packages_top.prepend('<tr class="alt content_package" data-pending-action-id='+data+'><td></td><td class="package_name">' + pkg_name + '</td><td class="package_action_status"><img style="padding-right:8px;" src="icons/spinner.gif">' + i18n.removing_package + '</td></tr>');
-                                } else {
-                                    add_row_shading = true;
-                                    packages_top.prepend('<tr class="content_package" data-pending-action-id='+data+'><td></td><td class="package_name">' + pkg_name + '</td><td class="package_action_status"><img style="padding-right:8px;" src="icons/spinner.gif">' + i18n.removing_package + '</td></tr>');
-                                }
-                            }
-                        }
-                        enableLinks();
-                        show_validation_error(false);
-                    },
-                    error: function() {
-                        enableLinks();
-                    }
-                });
-            } else {
-                show_validation_error(true, validation_error);
-            }
-        } else {
-            validation_error = validate_action_requested(content_array, KT.package_action_types.PKG_GRP);
-            if (validation_error === undefined) {
-                disableLinks();
-                $.ajax({
-                    url: KT.routes.remove_system_system_packages_path(system_id),
-                    type: 'POST',
-                    data: {'groups' : content_string},
-                    cache: false,
-                    success: function(data) {
-                        monitorStatus(data, KT.package_action_types.PKG_GRP_REMOVE);
-
-                        for (var i = 0; i < content_array.length; i += 1) {
-                            var group_name = $.trim(content_array[i]), already_exists = false;
-                            groups_in_progress[group_name] = true;
-
-                            $('tr.content_group').find('td.package_name').each( function() {
-                                if ($.trim($(this).html()) === group_name) {
-                                    already_exists = true;
-                                    $(this).parent().attr('data-pending-action-id', data);
-                                    $(this).parent().find('td.package_action_status').html('<img style="padding-right:8px;" src="icons/spinner.gif">' + i18n.removing_group);
-                                }
-                            });
-                            // if row already existed... skip...
-                            if (already_exists === false) {
-                                if (add_row_shading) {
-                                    add_row_shading = false;
-                                    packages_top.prepend('<tr class="alt content_group" data-pending-action-id='+data+'><td></td><td class="package_name">' + group_name + '</td><td class="package_action_status"><img style="padding-right:8px;" src="icons/spinner.gif">' + i18n.removing_group + '</td></tr>');
-                                } else {
-                                    add_row_shading = true;
-                                    packages_top.prepend('<tr class="content_group" data-pending-action-id='+data+'><td></td><td class="package_name">' + group_name + '</td><td class="package_action_status"><img style="padding-right:8px;" src="icons/spinner.gif">' + i18n.removing_group + '</td></tr>');
-                                }
-                            }
-                        }
-                        enableLinks();
-                        show_validation_error(false);
-                    },
-                    error: function() {
-                        enableLinks();
-                    }
-                });
-            } else {
-                show_validation_error(true, validation_error);
-            }
-        }
-    },
-    removePackages = function(data) {
-        data.preventDefault();
-        disableButtons();
-        packages_form.ajaxSubmit({
-            url: remove_button.attr('data-url'),
-            type: 'POST',
-            success: function(data) {
-                // locate the selected packages and update the status column to indicate the action being performed
-                $(':checkbox:checked').each( function() {
-                    var pkg = $(this).closest('.package');
-                    pkg.attr('data-pending-action-id', data);
-                    pkg.find('.package_action_status').html('<img style="padding-right:8px;" src="icons/spinner.gif">' + i18n.removing_package);
-                });
-                monitorStatus(data, KT.package_action_types.PKG_REMOVE);
-
-                enableButtons();
-            },
-            error: function() {
-                enableButtons();
-            }
-        });
-    },
-    updatePackages = function(data) {
-        data.preventDefault();
-        disableButtons();
-        packages_form.ajaxSubmit({
-            url: update_button.attr('data-url'),
-            type: 'POST',
-            success: function(data) {
-                // locate the selected packages and update the status column to indicate the action being performed
-                $(':checkbox:checked').each( function() {
-                    var pkg = $(this).closest('.package');
-                    pkg.attr('data-pending-action-id', data);
-                    pkg.find('.package_action_status').html('<img style="padding-right:8px;" src="icons/spinner.gif">' + i18n.updating_package);
-                });
-                monitorStatus(data, KT.package_action_types.PKG_UPDATE);
-
-                enableButtons();
-            },
-            error: function() {
-                enableButtons();
-            }
-        });
-    },
-    updateAllPackages = function(data) {
-        data.preventDefault();
-        disableButtons();
-        $.ajax({
-            url: update_button.attr('data-url'),
-            type: 'POST',
-            cache: false,
-            success: function() {
-                enableUpdateAll();
-            },
-            error: function() {
-                enableUpdateAll();
-            }
-        });
-    },
-    updateLoadedSummary = function() {
-        var total_loaded = $('tr.package:visible').length,
-            message = i18n.x_of_y_packages(total_loaded, total_packages);
-        loaded_summary.html(message);
-
-        if (total_loaded >= total_packages) {
-            more_button.remove();
-        }
-    },
-    validate_action_requested = function(content, content_type) {
-        // validate the action being requested and return a validation error, if an error is found
-        var validation_error;
-
-        // validate the package list format
-        if ((content_type === KT.package_action_types.PKG) && !KT.packages.valid_package_list_format(content)) {
-            validation_error = i18n.validation_error_name_format;
-
-        // validate that no actions pending on same package or group
-        } else {
-            var item;
-            $.each(content, function(index, content_item) {
-                item = $.trim(content_item);
-                switch (content_type) {
-                    case KT.package_action_types.PKG:
-                        if (packages_in_progress[item] === true) {
-                            validation_error = i18n.validation_error_package_pending;
-                            break;
-                        }
-                        break;
-                    case KT.package_action_types.PKG_GRP:
-                        if (groups_in_progress[item] === true) {
-                            validation_error = i18n.validation_error_group_pending;
-                            break;
-                        }
-                        break;
-                }
-            });
-        }
-        return validation_error;
-    },
-    show_validation_error = function(show, validation_error){
-        var input = content_form.find('#content_input');
-
-        if( show ){
-            input.addClass('validation_error_input');
-            error_message.html(validation_error);
-            error_message.show();
-        } else {
-            input.removeClass('validation_error_input');
-            error_message.hide();
-        }
-    };
-
-    return {
-        morePackages: morePackages,
-        sortOrder: sortOrder,
-        reverseSort: reverseSort,
-        initPackages: initPackages,
-        addContent: addContent,
-        removeContent: removeContent,
-        removePackages: removePackages,
-        updatePackages: updatePackages,
-        updateAllPackages: updateAllPackages
-    };
-})();
-
-$(document).ready(function() {
-    KT.system_packages.initPackages();
-});
diff --git a/app/assets/javascripts/katello/systems/custom_info.js b/app/assets/javascripts/katello/systems/custom_info.js
index 0dd04bca12e..7ac19b014ac 100644
--- a/app/assets/javascripts/katello/systems/custom_info.js
+++ b/app/assets/javascripts/katello/systems/custom_info.js
@@ -11,6 +11,7 @@
  http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
 */
 
+// Only used in the distributors (?) page, can remove once that has been redone.
 var KT = (KT === undefined) ? {} : KT;
 
 KT.custom_info = (function() {
diff --git a/app/assets/javascripts/katello/systems/index.js b/app/assets/javascripts/katello/systems/index.js
deleted file mode 100644
index a5fc6fc8fe6..00000000000
--- a/app/assets/javascripts/katello/systems/index.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- Copyright 2013 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-
-//= require "alchemy/jquery/plugins/ui.spinner"
-//= require "alchemy/jquery/plugins/jquery.sortElements"
-//= require "alchemy/jquery/plugins/jquery.multiselect"
-//= require "alchemy/jquery/plugins/jquery.multiselect.filter"
-//= require "alchemy/jquery/plugins/chosen.jquery"
-//= require "alchemy/jquery/plugins/jquery.treeTable"
-//= require "katello/widgets/auto_complete"
-//= require "katello/widgets/env_content_view_selector"
-//= require "katello/widgets/jquery.jeditable.helpers"
-//= require "katello/system_groups/system_groups_pane"
-//= require "katello/systems/packages"
-//= require "katello/systems/system_errata"
-//= require "katello/system_events/system_events"
-//= require "katello/systems/systems"
-//= require "katello/systems/custom_info"
diff --git a/app/assets/javascripts/katello/systems/packages.js b/app/assets/javascripts/katello/systems/packages.js
deleted file mode 100644
index 30133e95741..00000000000
--- a/app/assets/javascripts/katello/systems/packages.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- Copyright 2013 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-
-KT.packages = (function() {
-    var valid_package_list_format = function(packages){
-        var length = packages.length;
-
-        for (var i = 0; i < length; i += 1){
-            if( !valid_package_name(packages[i]) ){
-                return false;
-            }
-        }
-        return true;
-    },
-    valid_package_name = function(package_name){
-        var is_match = package_name.match(/[^abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\-\.\_\+\,]+/);
-
-        return is_match === null ? true : false;
-    };
-    return {
-        valid_package_list_format : valid_package_list_format,
-        valid_package_name : valid_package_name
-    };
-})();
diff --git a/app/assets/javascripts/katello/systems/system_edit.js b/app/assets/javascripts/katello/systems/system_edit.js
deleted file mode 100644
index 1d222b39747..00000000000
--- a/app/assets/javascripts/katello/systems/system_edit.js
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- Copyright 2013 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-
-$(document).ready(function() {
-
-    var common_settings = {
-            method          :  'PUT',
-            cancel          :  i18n.cancel,
-            submit          :  i18n.save,
-            indicator       :  i18n.saving,
-            tooltip         :  i18n.clickToEdit,
-            placeholder     :  i18n.systemReleaseVerDefault,
-            submitdata      :  $.extend({ authenticity_token: AUTH_TOKEN }, KT.common.getSearchParams()),
-            onerror         :  function(settings, original, xhr) {
-                original.reset();
-                $("#notification").replaceWith(xhr.responseText);
-                notices.checkNotices();
-            }
-        };
-
-    $('.edit_select_system_releasever').each(function(){
-        var element = $(this),
-            settings = {
-                type            :  'select',
-                name            :  element.attr('name'),
-                data            :  element.data('options'),
-                loadurl         :  element.data('loadurl'),
-                onsuccess       :  function(result, status, xhr){
-                    notices.checkNotices();
-                },
-                onerror         :  function(result, status, xhr){
-                    notices.checkNotices();
-                }
-            };
-        $(this).editable($(this).attr('data-url'), $.extend(common_settings, settings));
-    });
-
-    $('.edit_select_system_releasever_message').each(function(){
-        var element = $(this),
-            settings = {
-                type            :  'textarea',
-                name            :  element.attr('name'),
-                data            :  element.data('message'),
-                rows            :  8,
-                cols            :  36,
-                submit          :  false,
-                onsuccess       :  function(result, status, xhr){
-                    notices.checkNotices();
-                },
-                onerror         :  function(result, status, xhr){
-                    notices.checkNotices();
-                }
-            };
-        $(this).editable($(this).attr('data-url'), $.extend(common_settings, settings));
-    });
-
-});
diff --git a/app/assets/javascripts/katello/systems/system_errata.js b/app/assets/javascripts/katello/systems/system_errata.js
deleted file mode 100644
index d0eb496e706..00000000000
--- a/app/assets/javascripts/katello/systems/system_errata.js
+++ /dev/null
@@ -1,313 +0,0 @@
-/**
- Copyright 2013 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-
-KT.system = KT.system || {};
-
-KT.system.errata = (function() {
-    var errata_container,
-        table_body,
-        load_more,
-        task_list = {},
-        actions_updater,
-        parent_id,  // e.g. system id, system group id
-        items_url,
-        install_url,
-        status_url,
-        errata_for,
-        update_function,
-
-        init = function(editable, page){
-            errata_container = $('#errata_container');
-            table_body = errata_container.find('tbody');
-            load_more = $('#load_more_errata');
-
-            // This component is shared by the systems and system groups pages; however, some of the behavior is
-            // different depending on the page.  For example, the URLs to interact with the server.
-            errata_for = page;
-            parent_id = errata_container.data('parent_id');
-            if (page === 'system') {
-                items_url = KT.routes.items_system_errata_path(parent_id);
-                install_url = KT.routes.install_system_errata_path(parent_id);
-                status_url = KT.routes.status_system_errata_path(parent_id);
-                update_function = update_status_for_system;
-                KT.tipsy.custom.tooltip($('.tipsy-icon.errata-info'));
-            } else {
-                // errata_for === 'system_group'
-                items_url = KT.routes.items_system_group_errata_path(parent_id);
-                install_url = KT.routes.install_system_group_errata_path(parent_id);
-                status_url = KT.routes.status_system_group_errata_path(parent_id);
-                update_function = update_status_for_group;
-                KT.tipsy.custom.tooltip($('.tipsy-icon.systems, .tipsy-icon.errata-info'));
-            }
-
-            register_events();
-
-            // Not all users have permission to interact with errata; those that don't
-            // cannot check their status either.
-            if(editable) {
-                init_status_check();
-            }
-            show_spinner(true);
-            fetch_errata({ data : { clear_items : false }});
-        },
-        register_events = function(){
-            $('#display_errata_type').bind('change', { clear_items : true }, fetch_errata);
-            $('#select_all_errata').bind('change', select_all_errata);
-            $('#errata_state_radio_applied').bind('change', fetch_errata);
-            $('#errata_state_radio_outstanding').bind('change', fetch_errata);
-        $('#run_errata_button').bind('click', add_errata);
-        $('#select_all_button').bind('click', select_all);
-        $('#deselect_all_button').bind('click', deselect_all);
-            load_more.bind('click', { clear_items : false }, fetch_errata);
-        },
-        init_status_check = function(){
-            var timeout = 8000;
-
-            actions_updater = $.PeriodicalUpdater(status_url, {
-                method: 'get',
-                type: 'json',
-                data: function() {return {id: Object.keys(task_list)};},
-                global: false,
-                minTimeout: timeout,
-                maxTimeout: timeout
-            }, update_function);
-        },
-        fetch_errata = function(event){
-            var type = get_current_filter(),
-                state = get_current_state(),
-                offset,
-                clear_items = event.data ? event.data.clear_items : false;
-
-            if( clear_items ){
-                insert_data({ "html" : "", "results_count" : 0, "total_count" : 0, "current_count" : 0}, false);
-                show_spinner(true);
-            }
-
-            offset = clear_items ? 0 : $('#loaded_summary').data('current_count');
-
-            $.ajax({
-                method    : 'get',
-                url        : items_url,
-                data    : { filter_type : type, offset : offset, errata_state : state }
-            }).success(function(data){
-                insert_data(data, !clear_items);
-                show_spinner(false);
-            });
-        },
-        get_current_filter = function(){
-            return $('#display_errata_type').val();
-        },
-        get_current_state = function(){
-            return $('input[@name=errata_state_radio]:checked').val();
-        },
-        select_all_errata = function(){
-            var checkboxes = table_body.find(':checkbox');
-
-            if( $('#select_all_errata').attr('checked') ){
-                checkboxes.attr('checked', true);
-            } else {
-                checkboxes.attr('checked', false);
-            }
-        },
-        select_all = function(){
-            var checkboxes = table_body.find(':checkbox');
-            checkboxes.attr('checked', true);
-        },
-        deselect_all = function(){
-            var checkboxes = table_body.find(':checkbox');
-            checkboxes.attr('checked', false);
-        },
-        add_errata = function(){
-            var selected_errata = errata_container.find(':checkbox:checked'),
-                errata_ids = [],
-                params = {};
-
-            if ($('#run_errata_button').hasClass("disabled") || selected_errata.length === 0){
-                return;
-            }
-
-            $.each(selected_errata, function(index, value){
-                errata_ids.push($(value).val());
-            });
-
-            set_status(errata_ids, 'installing');
-
-            params["errata_ids"] = errata_ids;
-            params = $.param(params);
-
-            $.ajax({
-                url : install_url,
-                type : 'POST',
-                data : params
-            }).success(function(data){
-                if( Object.keys(task_list).length === 0 ){
-                    actions_updater.restart();
-                }
-                task_list[data] = errata_ids;
-                if(errata_for === 'system') {
-                    set_status(errata_ids, 'installing', undefined);
-                } else {
-                    set_status(errata_ids, 'installing', KT.routes.system_group_event_path(parent_id, data));
-                }
-            });
-        },
-        update_status_for_system = function(data){
-            var i = 0, length = data.length, task, url;
-
-            for(i; i < length; i += 1){
-                task = data[i];
-                url = KT.routes.system_event_path(parent_id, task.id);
-
-                if( task['state'] === 'finished' ){
-                    set_status(task_list[task['id']], 'finished', url);
-                    delete task_list[task['id']];
-                } else if( task['state'] === 'running' ){
-                    if( !task_list.hasOwnProperty(task['id']) ){
-                        task_list[task['id']] = task['parameters']['errata_ids'];
-                        set_status(task['parameters']['errata_ids'], 'installing', url);
-                    }
-                } else if( task['state'] === 'error' ){
-                    set_status(task_list[task['id']], 'failed', url);
-                    delete task_list[task['id']];
-                }
-            }
-
-            if( Object.keys(task_list).length === 0 ){
-                actions_updater.stop();
-            }
-        },
-        update_status_for_group = function(data){
-            var i = 0, num_jobs = data.length, job, num_tasks, task, url;
-
-            for(i; i < num_jobs; i += 1){
-                job = data[i];
-                num_tasks = job.tasks.length;
-                url = KT.routes.system_group_event_path(parent_id, job.id);
-
-                var j = 0, running = 0, error = 0;
-                for(j; j < num_tasks; j += 1){
-                    task = job.tasks[j];
-                    if ((task.state === 'waiting') || (task.state === 'running')) {
-                        running += 1;
-                    } else if (task.state === 'error') {
-                        error += 1;
-                    }
-                }
-                if (running > 0) {
-                    // still have a task running... status should remain installing
-                    if( !task_list.hasOwnProperty(job.id) ){
-                        task_list[job.id] = job['parameters']['errata_ids'];
-                        set_status(task_list[job.id], 'installing', url);
-                    }
-                } else if (error > 0) {
-                    // no tasks are still running, but at least 1 error was encountered
-                    set_status(task_list[job.id], 'failed', url);
-                    delete task_list[job.id];
-                } else {
-                    // looks like all tasks completed...
-                    set_status(task_list[job.id], 'finished', url);
-                    delete task_list[job.id];
-                }
-            }
-
-            if( Object.keys(task_list).length === 0 ){
-                actions_updater.stop();
-            }
-        },
-        insert_data = function(data, append){
-            var html = data["html"];
-
-            if(data.total_count > 0){
-                $('#run_errata_button').removeClass("disabled");
-            }
-            if( append ){
-                table_body.append(html);
-            } else {
-                table_body.html(html);
-            }
-            update_counts(data);
-        },
-        update_counts = function(data){
-            var current_count = data["current_count"],
-                total_count = data["total_count"],
-                results_count = data["results_count"];
-
-            $('#loaded_summary').data('current_count', current_count),
-            $('#loaded_summary').html(i18n.x_of_y_total(current_count, results_count, total_count));
-
-            if( current_count === results_count ){
-                load_more.hide();
-            } else {
-                load_more.show();
-            }
-        },
-        show_spinner = function(show){
-            if( show ){
-                $('#list-spinner').show();
-            } else {
-                $('#list-spinner').hide();
-            }
-        },
-        set_status = function(errata_ids, status, url){
-            var rows = get_rows(errata_ids),
-                errata_row, i, length;
-
-            length = rows.length;
-
-            for( i = 0; i < length; i += 1){
-                errata_row = rows[i];
-
-                if( status === 'installing' ){
-                    errata_row.find('.errata_status_text').html(get_status_block(i18n.installing, url));
-                    errata_row.find('img').show();
-                } else if( status === 'finished' ){
-                    errata_row.find('img').hide();
-                    errata_row.find('.errata_status_text').html(get_status_block(i18n.install_finished, url));
-                } else if ( status === 'failed' ) {
-                    errata_row.find('img').hide();
-                    errata_row.find('.errata_status_text').html(get_status_block(i18n.install_error, url));
-                }
-                errata_row.find('.errata_status').show();
-            }
-        },
-        get_status_block = function(status, url){
-            if(url === undefined) {
-                return status;
-            } else {
-                var html = '<a data-url="' + url + '" class="subpanel_element">' + status + '</a>';
-                return html;
-            }
-        },
-        get_rows = function(errata_ids){
-            var i = 0,
-                length = errata_ids.length,
-                rows = [];
-
-            for( i; i < length; i += 1){
-                rows.push($('#errata_' + KT.common.escapeId(errata_ids[i])));
-            }
-
-            return rows;
-        };
-
-    return {
-        init    : init
-    };
-
-})();
-
-// Call this init() from a location where the 'editable' flag can be set
-// appropriately. In this case it is called from errata/_index.html.haml
-//$(document).ready(function() {
-//    KT.system.errata.init(editable);
-//});
diff --git a/app/assets/javascripts/katello/systems/system_products.js b/app/assets/javascripts/katello/systems/system_products.js
deleted file mode 100644
index cb41b570cf9..00000000000
--- a/app/assets/javascripts/katello/systems/system_products.js
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
- Copyright 2013 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-/**
- * Created by .
- * User: jrist
- * Date: 7/13/11
- * Time: 2:27 PM
- *
- * This file is for use with the products subnav within systems page.
- */
-
-$(document).ready(function() {
-    $('#products_more').bind('click', function(){
-        KT.products.moreProducts();
-    });
-    $('#products_sort').bind('click', function(){
-        KT.products.reverseSort();
-    });
-});
-
-KT.products = (function(){
-    return {
-        moreProducts : function(){
-            var list = $('.products');
-            var more = $('#products_more');
-            var spinner = $('#list-spinner');
-            var dataScrollURL = more.attr("data-scroll_url");
-
-            var offset = parseInt(more.attr("data-offset"), 10);
-            var page_size = parseInt(more.attr("data-page_size"), 10);
-            var products_count = parseInt(more.attr("data-products_count"), 0);
-            dataScrollURL = dataScrollURL + "?offset=" + offset + "&order="+ $('#products_sort').attr("data-sort") +"&";
-            spinner.fadeIn();
-            $.ajax({
-                type: "GET",
-                url: dataScrollURL,
-                cache: false,
-                success: function(data) {
-                    KT.products.retrievingNewContent = false;
-                    spinner.fadeOut();
-                    list.append(data);
-                    $('#filter').keyup();
-                    $('.scroll-pane').jScrollPane().data('jsp').reinitialise();
-                    offset = offset + page_size;
-                    if (data.length === 0 || offset >= products_count) {
-                        more.hide(); // Hide more button, but still use it to hold data
-                    }
-                    more.attr("data-offset", offset);
-                },
-                error: function() {
-                    spinner.fadeOut();
-                    KT.products.retrievingNewContent = false;
-                }
-            });
-        },
-        sortOrder : function(){
-            var productSort = $('#products_sort');
-            var productSortOrder = productSort.attr("data-sort");
-            if (productSort.attr("data-sort") === "asc"){
-                productSortOrder = "desc";
-                productSort.removeClass("ascending").addClass("descending");
-            } else {
-                productSortOrder = "asc";
-                productSort.removeClass("descending").addClass("ascending");
-            }
-            productSort.attr("data-sort", productSortOrder);
-            return productSortOrder;
-        },
-        reverseSort : function(){
-            var list = $('.products');
-            var more = $('#products_more');
-            var spinner = $('#list-spinner');
-            var dataScrollURL = more.attr("data-scroll_url");
-            var reverse = parseInt(more.attr("data-offset"), 10);
-
-            dataScrollURL = dataScrollURL + "?reverse=" + reverse + "&order=" + KT.products.sortOrder() + "&";
-            spinner.fadeIn();
-            list.find('tbody > tr').empty().remove();
-            $.ajax({
-                type: "GET",
-                url: dataScrollURL,
-                cache: false,
-                success: function(data) {
-                    KT.products.retrievingNewContent = false;
-                    spinner.fadeOut();
-                    list.append(data);
-                    $('#filter').keyup();
-                    $('.scroll-pane').jScrollPane().data('jsp').reinitialise();
-                    if (data.length === 0) {
-                        more.empty().remove();
-                    }else{
-                        $('#products_more').attr("data-offset", reverse);
-                    }
-                },
-                error: function() {
-                    spinner.fadeOut();
-                    KT.products.retrievingNewContent = false;
-                }
-            });
-        },
-        retrievingNewContent : true
-    };
-})();
diff --git a/app/assets/javascripts/katello/systems/system_subscriptions.js b/app/assets/javascripts/katello/systems/system_subscriptions.js
deleted file mode 100644
index fe942387c34..00000000000
--- a/app/assets/javascripts/katello/systems/system_subscriptions.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- Copyright 2013 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-
-
-/*
- * A small javascript file needed to load system subscription related stuff
- *
- */
-
-$(document).ready(function() {
-  KT.subs.unsubSetup();
-  KT.subs.subSetup();
-  KT.subs.spinnerSetup();
-  KT.subs.autohealSetup();
-  KT.subs.matchsystemSetup();
-
-  $("#unsubscribeTable").treeTable({
-    expandable: true,
-    initialState: "collapsed",
-    clickableNodeNames: true,
-    onNodeShow: function(){$.sparkline_display_visible()}
-  });
-
-  $("#subscribeTable").treeTable({
-    expandable: true,
-    initialState: "collapsed",
-    clickableNodeNames: true,
-    onNodeShow: function(){$.sparkline_display_visible()}
-  });
-
-    // Auto-heal with service level used in systems/_subscriptions.html.haml
-    $('.edit_select_system_servicelevel').each(function(){
-        var common_settings = {
-                method          :  'PUT',
-                cancel          :  i18n.cancel,
-                submit          :  i18n.save,
-                indicator       :  i18n.saving,
-                tooltip         :  i18n.clickToEdit,
-                placeholder     :  i18n.systemSelectAutoheal,
-                submitdata      :  $.extend({ authenticity_token: AUTH_TOKEN }, KT.common.getSearchParams()),
-                onerror         :  function(settings, original, xhr) {
-                    original.reset();
-                    $("#notification").replaceWith(xhr.responseText);
-                    notices.checkNotices();
-                }
-        };
-        var element = $(this),
-            settings = {
-                type            :  'select',
-                name            :  element.attr('name'),
-                data            :  element.data('options'),
-                onsuccess       :  function(result, status, xhr){
-                    element.select(xhr.responseText);
-                    notices.checkNotices();
-                }
-            };
-        $(this).editable($(this).attr('data-url'), $.extend(common_settings, settings));
-    });
-
-
-});
diff --git a/app/assets/javascripts/katello/systems/systems.js b/app/assets/javascripts/katello/systems/systems.js
deleted file mode 100644
index 05e1d8b61f2..00000000000
--- a/app/assets/javascripts/katello/systems/systems.js
+++ /dev/null
@@ -1,793 +0,0 @@
-/**
- Copyright 2011-2013 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-
-KT.panel.set_expand_cb(function(){
-    var children = $('#panel .menu_parent');
-    $.each(children, function(i, item) {
-        KT.menu.hoverMenu(item, { top : '75px' });
-    });
-
-    KT.system_groups_pane.register_multiselect();
-
-    setTimeout(function() {
-        $('#subscription_filters').attr('disabled', false).trigger('liszt:updated');
-    }, 500);
-});
-
-if (KT.panel_search_autocomplete !== undefined) {
-    KT.panel_search_autocomplete = KT.panel_search_autocomplete.concat(["distribution.name:", "distribution.version:", "network.hostname:", "network.ipaddr:"]);
-}
-
-(function(){
-    var options = { create : 'new_system' };
-
-    if (window.env_select !== undefined) {
-
-        // When the systems index page env selector changes, update the pre-populated attributes
-        env_select.env_changed_callback = function(env_id) {
-            if(env_select.envsys === true){
-                $('#new').attr('data-ajax_url', KT.routes.new_system_path() + '?env_id=' + env_id);
-            }
-            if($("#system_content_view_id").length > 0) {
-                KT.systems_page.update_content_views();
-            }
-            $('#system_environment_id').attr('value', env_id);
-        };
-
-        $.extend(options, { 'extra_params' :
-                    [ { hash_id     : 'env_id',
-                        init_func     : function(){
-                            if ($.bbq) {
-                                var state = $.bbq.getState('env_id');
-
-                                if( state ){
-                                    env_select.set_selected(state);
-                                } else {
-                                    $.bbq.pushState({ env_id : env_select.get_selected_env() });
-                                }
-                            }
-                        }
-                    }
-                ]});
-      }
-      KT.panel.list.registerPage('systems', options);
-}());
-
-$(document).ready(function() {
-
-    KT.panel.set_expand_cb(function() {
-        KT.systems_page.system_info_setup();
-        KT.subs.initialize_edit();
-    });
-
-    KT.systems_page.registerActions();
-    KT.systems_page.system_group_setup();
-    KT.system_groups_pane.register_events();
-
-    // These run after the subscribe/unsubscribe forms have been submitted to update
-    // the left hand list entry (which reflects the subscribed status of the system).
-    $('#unsubscribe').live('ajax:complete', function(evt, data, status, xhr){
-        var id = $('.left_panel').find('.active');
-        var url = id.attr('data-ajax_url');
-        KT.panel.list.refresh(id.attr('id'), url);
-        $(this).find('input[type="submit"]').removeAttr('disabled');
-    }).live('ajax:before', function(){
-        $(this).find('input[type="submit"]').attr('disabled', 'disabled');
-    });
-
-    $('#subscribe').live('ajax:complete', function(evt, data, status, xhr){
-        var id = $('.left_panel').find('.active');
-        var url = id.attr('data-ajax_url');
-        KT.panel.list.refresh(id.attr('id'), url);
-        $(this).find('input[type="submit"]').removeAttr('disabled');
-    }).live('ajax:before', function(){
-        $(this).find('input[type="submit"]').attr('disabled', 'disabled');
-    });
-});
-
-KT.systems_page = (function() {
-    var system_group_widget,
-    env_change = function(env_id, element) {
-      var url = element.attr("data-url");
-      window.location = url;
-    },
-    create_system = function(data) {
-        var button = data.find('input[type|="submit"]');
-        button.attr("disabled","disabled");
-        data.ajaxSubmit({
-            success: function(data) {
-                list.add(data);
-                KT.panel.closePanel($('#panel'));
-                KT.panel.select_item(list.last_child().attr("id"));
-            },
-            error: function(e) {
-                button.removeAttr('disabled');
-            }
-        });
-    },
-    registerActions = function() {
-        var removeSystem = $(".panel_action[data-id=remove_systems]"),
-            pkg = $(".panel_action[data-id=systems_package_action]"),
-            errata = $(".panel_action[data-id=systems_errata_action]"),
-            system_group = $(".panel_action[data-id=systems_system_groups_action]");
-
-        KT.panel.actions.registerAction("remove_systems",
-            {  url: removeSystem.data("url"),
-               method: removeSystem.data("method"),
-               success_cb: function(ids){
-                    $.each(ids,function(index, item){
-                        list.remove("system_" + item);
-                    });
-               },
-                valid_input_cb: function() {
-                    var confirmation_text = removeSystem.find('.confirmation_text');
-                    confirmation_text.html(i18n.confirm_system_remove_action(KT.panel.numSelected()));
-                    return true;
-                }
-            }
-        );
-
-        KT.panel.actions.registerAction("systems_package_action",
-            {
-                enable_cb: function() {
-                    $('#packages_input').removeAttr('disabled');
-                    $('#systems_action_packages').removeAttr('disabled');
-                    $('#systems_action_package_groups').removeAttr('disabled');
-                    $('.request_action.package').removeAttr('disabled');
-                },
-                disable_cb: function() {
-                    $('#packages_input').attr('disabled', true);
-                    $('#systems_action_packages').attr('disabled', true);
-                    $('#systems_action_package_groups').attr('disabled', true);
-                    $('.request_action.package').attr('disabled', true);
-                    pkg.find('.validation_error').hide();
-                },
-                valid_input_cb: function(request_action) {
-                    // If the user hasn't provided the necessary inputs, generate an error
-                    var valid = true,
-                        content_type_selected = $("input[name=systems_action]:checked"),
-                        content_id = content_type_selected.attr('id'),
-                        content_input = $.trim($('#packages_input').val()),
-                        content_error = pkg.find('.validation_error'),
-                        confirmation_text = pkg.find('.confirmation_text');
-
-                    if (content_type_selected.length === 0) {
-                        // an content type hasn't been selected
-                        content_error.html(i18n.validation_error_select_content_type);
-                        valid = false;
-                    }
-                    else if (content_input.length === 0) {
-                        if (content_id === 'systems_action_packages') {
-                            // the pkg list is empty, but the action is install or remove
-                            content_error.html(i18n.validation_error_pkg_list_empty);
-                            valid = false;
-                        } else {
-                            // user selected pkg groups
-                            content_error.html(i18n.validation_error_pkg_group_list_empty);
-                            valid = false;
-                        }
-                    }
-                    else if ((content_id === 'systems_action_packages') && !KT.packages.valid_package_list_format(content_input.split(/ *, */))) {
-                        // the pkg list is invalid
-                        content_error.html(i18n.validation_error_pkg_name_format);
-                        valid = false;
-                    }
-                    if (valid) {
-                        content_error.hide();
-
-                        // update the confirmation text based on the requested action
-                        var action_text = request_action.val().toLowerCase(),
-                            content_type_text = content_type_selected.next('label').text().toLowerCase();
-
-                        confirmation_text.html(i18n.confirm_package_action(action_text, content_type_text, KT.panel.numSelected()));
-
-                    } else {
-                        content_error.show();
-                    }
-                    return valid;
-                },
-                ajax_cb: function(ids_selected, request_action, confirm_dialog) {
-                    var content_type_selected = $("input[name=systems_action]:checked").attr('id'),
-                        content_array = [],
-                        content_string = $.trim($('#packages_input').val());
-
-                    if (content_string.length > 0) {
-                        content_array = content_string.split(/ *, */);
-                    }
-
-                    if (content_type_selected === 'systems_action_packages') {
-                        $.ajax({
-                            cache: 'false',
-                            type: request_action.data('method'),
-                            url: request_action.data('url'),
-                            data: {ids:ids_selected, packages:content_array},
-                            success: function() {
-                                // on success, close the request confirmation dialog
-                                confirm_dialog.slideUp('fast');
-                            }
-                        });
-                    } else {
-                        $.ajax({
-                            cache: 'false',
-                            type: request_action.data('method'),
-                            url: request_action.data('url'),
-                            data: {ids:ids_selected, groups:content_array},
-                            success: function() {
-                                // on success, close the request confirmation dialog
-                                confirm_dialog.slideUp('fast');
-                            }
-                        });
-                    }
-                }
-            }
-        );
-
-        KT.panel.actions.registerAction("systems_errata_action",
-            {
-                enable_cb: function() {
-                    $('#errata_input').removeAttr('disabled');
-                    $('.request_action.errata').removeAttr('disabled');
-                },
-                disable_cb: function() {
-                    $('#errata_input').attr('disabled', true);
-                    $('.request_action.errata').attr('disabled', true);
-                    errata.find('.validation_error').hide();
-                },
-                valid_input_cb: function(request_action) {
-                    // If the user hasn't provided the necessary inputs, generate an error
-                    var valid = true,
-                        errata_input = $.trim($('#errata_input').val()),
-                        errata_error = errata.find('.validation_error'),
-                        confirmation_text = errata.find('.confirmation_text');
-
-                    if (errata_input.length === 0) {
-                        // the errata list is empty
-                        errata_error.html(i18n.validation_error_errata_list_empty);
-                        valid = false;
-                    }
-                    if (valid) {
-                        confirmation_text.html(i18n.confirm_errata_action(KT.panel.numSelected()));
-
-                        errata_error.hide();
-                    } else {
-                        errata_error.show();
-                    }
-                    return valid;
-                },
-                ajax_cb: function(ids_selected, request_action, confirm_dialog) {
-                    var errata_string = $('#errata_input').val(),
-                        errata_array = errata_string.split(/ *, */);
-
-                    $.ajax({
-                        cache: 'false',
-                        type: errata.data('method'),
-                        url: errata.data('url'),
-                        data: {ids:ids_selected, errata:errata_array},
-                        success: function() {
-                            // on success, close the request confirmation dialog
-                            confirm_dialog.slideUp('fast');
-                        }
-                    });
-                }
-            }
-        );
-
-        KT.panel.actions.registerAction("systems_system_groups_action",
-            {
-                enable_cb: function() {
-                    enable_system_group_inputs();
-                },
-                disable_cb: function() {
-                    disable_system_group_inputs();
-                    system_group.find('.validation_error').hide();
-                },
-                valid_input_cb: function(request_action) {
-                    // If the user hasn't provided the necessary inputs, generate an error
-                    var valid = true,
-                        system_groups_checked = $("#bulk_system_system_group_id").multiselect("getChecked"),
-                        system_group_error = system_group.find('.validation_error'),
-                        confirmation_text = system_group.find('.confirmation_text');
-
-                    if (system_groups_checked.length === 0) {
-                        system_group_error.html(i18n.validation_error_system_group_empty);
-                        valid = false;
-                    }
-
-                    if (valid) {
-                        system_group_error.hide();
-
-                        if (request_action.data('action') === 'add_group') {
-                            confirmation_text.html(i18n.confirm_system_group_add_action(KT.panel.numSelected()));
-                        } else {
-                            confirmation_text.html(i18n.confirm_system_group_remove_action(KT.panel.numSelected()));
-                        }
-                    } else {
-                        system_group_error.show();
-                    }
-                    return valid;
-                },
-                ajax_cb: function(ids_selected, request_action, confirm_dialog) {
-                    var checked = $("#bulk_system_system_group_id").multiselect("getChecked"),
-                        group_ids = checked.map(function(){return this.value;}).get();
-
-                    $.ajax({
-                        cache: 'false',
-                        type: request_action.data('method'),
-                        url: request_action.data('url'),
-                        data: {ids:ids_selected, group_ids:group_ids},
-                        success: function() {
-                            // on success, close the request confirmation dialog
-                            confirm_dialog.slideUp('fast');
-                        }
-                    });
-                }
-            }
-        );
-    },
-    system_info_setup = function() {
-        var pane = $("#system");
-        if (pane.length === 0) {
-            return;
-        }
-
-        KT.env_content_view_selector.init('edit_env_view',
-            'environment_path_selector', KT.available_environments, KT.current_environment_id,
-            'content_view_selector', KT.available_content_views, KT.current_content_view_id,
-            'env_content_view_selector_buttons');
-    },
-    system_group_setup = function() {
-        $('#create_system_group').live('click', create_system_group);
-        $('#update_system_groups').live('submit', update_system_groups);
-
-        system_group_widget = $("#bulk_system_system_group_id").multiselect({
-            noneSelectedText: i18n.select_system_groups,
-            selectedList: 4,
-            create: function(event, ui) {
-                var html = '<div class="none_matched">'+i18n.group_does_not_exist+'<a id="create_system_group" class="st_button">'+i18n.confirm_create+'</a></div>';
-                $('.ui-multiselect-checkboxes').before(html);
-
-            },
-            beforeopen: function(event, ui) {
-                var none_matched = $('.none_matched');
-                none_matched.hide();
-            }
-        }).multiselectfilter({
-            autoReset: true,
-            filter: function(event, matches) {
-                var none_matched = $('.none_matched'),
-                    filter = $('.ui-multiselect-filter > input').val();
-
-                if (!filter.length || $(matches).filter('[title="'+filter+'"]').length) {
-                    // found an exact match or the filter is empty
-                    none_matched.hide();
-                } else {
-                    none_matched.show();
-                }
-            }
-        });
-        system_group_widget.multiselect('disable');
-    },
-    create_system_group = function() {
-        var group = $('.ui-multiselect-filter > input').val();
-        disable_system_group_inputs();
-        $.ajax({
-            cache: 'false',
-            type: 'POST',
-            url: KT.routes.system_groups_path(),
-            data: {system_group:{name:group}},
-            dataType: 'json',
-            success: function(response) {
-                // add the new group to the multiselect and select it
-                var opt = $('<option />', {value: response.id, text: response.name});
-                opt.appendTo(system_group_widget);
-                opt.attr('selected','selected');
-                system_group_widget.multiselect('refresh');
-                system_group_widget.multiselect('close');
-                enable_system_group_inputs();
-            },
-            error: function() {
-                enable_system_group_inputs();
-            }
-        });
-    },
-    disable_system_group_inputs = function(){
-        system_group_widget.multiselect('disable');
-        $('.request_action.system_group').attr('disabled', true);
-    },
-    enable_system_group_inputs = function(){
-        system_group_widget.multiselect('enable');
-        $('.request_action.system_group').removeAttr('disabled');
-    },
-    update_system_groups = function(e) {
-        e.preventDefault();
-        var button = $(this).find('input[type|="submit"]');
-        button.attr("disabled","disabled");
-        $(this).ajaxSubmit({
-            success: function(data) {
-                button.removeAttr('disabled');
-            },
-            error: function(e) {
-                button.removeAttr('disabled');
-            }
-        });
-    },
-    update_content_views = function(){
-        // this function will retrieve the views associated with a given environment and
-        // update the views box with the results
-        var url = $('.path_link.active').attr('data-content_views_url');
-        if (url !== undefined) {
-            $.ajax({
-                type: "GET",
-                url: url,
-                cache: false,
-                success: function(response) {
-                    // update the appropriate content on the page
-                    var options = '';
-                    var opt_template = KT.utils.template("<option value='<%= key %>'><%= text %></option>");
-
-                    if (response.length > 0) {
-                        // create an html option list using the response
-                        $.each(response, function(key, item) {
-                            options += opt_template({key: item.id, text: item.name});
-                        });
-                        highlight_content_views(i18n.select_content_view);
-                    } else {
-                        // the user selected an environment that has not views, warn them
-                        highlight_content_views(i18n.no_content_views_available);
-                    }
-                    $("#system_content_view_id").html(options);
-                }
-            });
-        }
-    },
-    highlight_content_views = function(text){
-        var select_input = $("#system_content_view_id"),
-            highlight_text = select_input.next('span.highlight_input_text');
-
-        select_input.addClass('highlight_input');
-        if (highlight_text.length > 0) {
-            highlight_text.html(text);
-        } else {
-            select_input.after('<span class ="highlight_input_text">' + text + '</span>');
-        }
-    },
-    remove_content_view_highlight = function() {
-        var select_input = $("#system_content_view_id");
-        select_input.removeClass('highlight_input');
-        select_input.next('span.highlight_input_text').remove();
-    };
-
-    return {
-        env_change : env_change,
-        create_system : create_system,
-        registerActions : registerActions,
-        update_content_views: update_content_views,
-        highlight_content_views: highlight_content_views,
-        system_info_setup: system_info_setup,
-        system_group_setup: system_group_setup
-    };
-})();
-
-KT.system_auto_attaching = (function() {
-
-    var task_status_updater;
-
-    $(document).ready(function() {
-        KT.system_auto_attaching.setup();
-        KT.system_auto_attaching.async_panel_refresh();
-    });
-
-    var async_panel_refresh = function() {
-        if (auto_attach_all_button().length > 0) {
-            if (task_status_updater !== undefined) {
-                task_status_updater.stop();
-            }
-            var state = auto_attach_all_button().data("taskstate");
-            if (state === "waiting" || state === "running") {
-                start_updater(auto_attach_all_button().data("taskuuid"));
-            }
-        }
-    };
-
-    var start_updater = function(task_uuid) {
-        allow_auto_attach_all_systems(false);
-        auto_attach_all_button().addClass("processing");
-        var timeout = 6000;
-
-        if (task_status_updater !== undefined) {
-            task_status_updater.stop();
-        }
-
-        task_status_updater = $.PeriodicalUpdater(
-            KT.routes.api_task_path(task_uuid),
-            {
-                method: 'get',
-                type: 'json',
-                cache: false,
-                global: false,
-                minTimeout: timeout,
-                maxTimeout: timeout
-            },
-            update_status
-        );
-    };
-
-    var update_status = function(data, success, xhr, handle) {
-        if (data !== "") {
-            var state = data['state'];
-            if (state !== "waiting" && state !== "running") {
-                auto_attach_all_button().removeClass("processing");
-                allow_auto_attach_all_systems(true);
-                task_status_updater.stop();
-                if (data['result'].length > 0) {
-                    notices.displayNotice("success", window.JSON.stringify({"notices": [i18n.auto_attach_all_systems_success] }));
-                }
-            }
-        }
-    };
-
-    var setup = function() {
-        auto_attach_all_button().live("click", function() {
-            auto_attach_all_systems();
-        });
-    };
-
-    var auto_attach_all_systems = function() {
-        var button = auto_attach_all_button();
-        $.ajax({
-            url: button.data("url"),
-            type: button.data("method"),
-            data: '',
-            success: function(data) {
-                start_updater(data['uuid']);
-            },
-            error: function(data) {
-                notices.displayNotice("error", window.JSON.stringify({"notices": [i18n.auto_attach_all_systems_failure] }));
-            }
-        });
-    };
-
-    var allow_auto_attach_all_systems = function(allow) {
-        if (allow === true) {
-            auto_attach_all_button().removeAttr('disabled');
-        } else {
-            auto_attach_all_button().attr('disabled', 'true');
-        }
-    };
-
-    var auto_attach_all_button = function() {
-        return $(".panel_action #auto_attach_all_button");
-    };
-
-    return {
-        setup : setup,
-        auto_attach_all_systems: auto_attach_all_systems,
-        auto_attach_all_button: auto_attach_all_button,
-        async_panel_refresh: async_panel_refresh
-    };
-})();
-
-KT.subs = (function() {
-    KT.panel.set_expand_cb(function() {
-        auto_attach_setup();
-    });
-
-    var auto_attach_setup = function() {
-        heal_system_button().live("click", function() {
-            heal_system();
-        });
-    };
-
-    var heal_system = function() {
-        var button = heal_system_button();
-        $.ajax({
-            url  : button.data("url"),
-            type : button.data("method"),
-            data : '',
-            success: function(data) {
-                notices.displayNotice("success", window.JSON.stringify({"notices": [i18n.runAutoAttachSuccess]}));
-            },
-            error: function(data) {
-                notices.displayNotice("error", window.JSON.stringify({"notices": [i18n.runAutoAttachFail]}));
-            }
-        });
-    };
-
-    var heal_system_button = function() {
-        return $("#heal_system_button");
-    };
-
-    var unsubSetup = function(){
-        var unsubform = $('#unsubscribe');
-        var unsubbutton = $('#unsub_submit');
-        var fakeunsubbutton = $('#fake_unsub_submit');
-        var unsubcheckboxes = $('#unsubscribe input[type="checkbox"]');
-        var total = unsubcheckboxes.length;
-        var checked = 0;
-        unsubbutton.hide();
-        unsubcheckboxes.each(function() {
-            $(this).change(function() {
-                if ($(this).is(":checked")) {
-                    checked += 1;
-                    if (!(unsubbutton.is(":visible"))) {
-                        fakeunsubbutton.fadeOut("fast", function() { unsubbutton.fadeIn(); });
-                    }
-                } else {
-                    checked -= 1;
-                    if ((unsubbutton.is(":visible")) && checked === 0) {
-                        unsubbutton.fadeOut("fast", function() { fakeunsubbutton.fadeIn(); });
-                    }
-                }
-            });
-        });
-    };
-
-    var save_selected_environment = function(env_id) {
-        // save the id of the env selected
-        $("#system_environment_id").attr('value', env_id);
-    };
-
-    var initialize_edit = function() {
-        reset_env_select();
-    };
-
-    var reset_env_select = function() {
-        if (window.env_select !== undefined) {
-            $('#path-expanded').hide();
-            env_select.reset_hover();
-            env_select.recalc_scroll();
-        }
-    };
-
-    var _checked = 0;  // scoped variable to hold number of checkboxes
-
-    var updateSubButtons = function() {
-        var subbutton = $('#sub_submit'),
-            fakesubbutton = $('#fake_sub_submit');
-
-        if (_checked > 0 && !subbutton.is(":visible")) {
-            fakesubbutton.fadeOut("fast", function(){subbutton.fadeIn()});
-        } else if (_checked === 0 && subbutton.is(":visible")) {
-            subbutton.fadeOut("fast", function(){fakesubbutton.fadeIn()});
-        }
-    };
-
-    var subSetup = function(){
-        var subcheckboxes = $('#subscribe input[type="checkbox"]'),
-            subbutton = $('#sub_submit');
-
-        _checked = 0;
-        subbutton.hide();
-
-        subcheckboxes.each(function(){
-            $(this).change(function(){
-                var id = $(this).attr("id").substring("subscription_".length),
-                    spinner,
-                    direction,
-                    value,
-                    of_string;
-
-                spinner = $("#spinner_" + id);
-                if ($(this).is(":checked")) {
-                    _checked += 1;
-                    direction = "increment";
-                    value = spinner.data("suggested");
-                } else {
-                    _checked -= 1;
-                    direction = "decrement";
-                    value = 0;
-                }
-                if (spinner.length > 0) {
-                    if (spinner.attr("class") === "ui-spinner") {
-                        if ((spinner.spinner("value") === 0 && value > 0) ||
-                           (spinner.spinner("value") !== 0 && value === 0)) {
-                            spinner.spinner("value", value);
-                        }
-                    } else if (spinner.attr("class") === "ui-nonspinner") {
-                        spinner.val(value);
-                        spinner = $("#spinner_label_" + id);
-                        if (spinner.length > 0) {
-                            of_string = value + spinner[0].innerHTML.substr(1);
-                            spinner[0].innerHTML = of_string;
-                        }
-                    }
-                    updateSubButtons();
-                }
-            });
-        });
-    };
-
-    var spinnerSetup = function(){
-        setTimeout(function() {
-            $('.ui-spinner').spinner();
-        }, 1000);
-        $('.ui-spinner').each(function() {
-            $(this).change(function(e) {
-                var id = $(this).attr("id").substring("spinner_".length),
-                    checkbox = $("#subscription_" + id)[0],
-                    val = e.currentTarget.value,
-                    check = (val !== 0);
-
-                if (checkbox.checked !== check) {
-                    checkbox.checked = check;
-                    if (check) {
-                        _checked += 1;
-                    } else {
-                        _checked -= 1;
-                    }
-                    updateSubButtons();
-                }
-            });
-            $(this).keypress(function(e) {
-                if (e.which === 13) {
-                    $(this).trigger("change");
-                }
-            });
-        });
-    };
-
-    var autohealSetup = function(){
-        var checkboxes = $('#autoheal');
-        checkboxes.each(function(){
-            $(this).unbind("change");
-            $(this).change(function(){
-                $('#autoheal_form').ajaxSubmit({
-                    data: { autoheal: $(this).is(":checked") },  // Checkboxes in forms aren't included when false
-                    dataType: 'html',
-                    success: function(data) {
-                        notices.checkNotices();
-                    }, error: function(e) {
-                        notices.checkNotices();
-                    }
-                });
-            });
-        });
-    };
-
-    var matchsystemSetup = function(){
-        $('#subscription_filters').chosen().change(function(e) {
-            var children = $(this).children();
-            $('#available_section').addClass('hidden');
-            $('#available_spinner').removeClass('hidden');
-            var i = 0;
-            $.each(children, function(i, item) {
-                $.ajax({
-                    url: $('#matchsystem_form')[0].action + "?preference=" + item.value,
-                    data: { value: item.selected },
-                    type: 'PUT',
-                    success: function(data) {
-                        if (i === children.length-1) {
-                            $('#systems_subscriptions > a').click();  // Refresh page
-                        }
-                    },
-                    error: function(e) {
-                        if (i === children.length-1) {
-                            $('#systems_subscriptions > a').click();  // Refresh page
-                        }
-                    }
-                });
-            });
-        });
-    };
-
-    return {
-        unsubSetup: unsubSetup,
-        subSetup: subSetup,
-        spinnerSetup: spinnerSetup,
-        save_selected_environment: save_selected_environment,
-        initialize_edit: initialize_edit,
-        reset_env_select: reset_env_select,
-        autohealSetup: autohealSetup,
-        matchsystemSetup: matchsystemSetup
-    };
-})();
diff --git a/app/assets/javascripts/katello/users/index.js b/app/assets/javascripts/katello/users/index.js
deleted file mode 100644
index d1d6d63746d..00000000000
--- a/app/assets/javascripts/katello/users/index.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- Copyright 2013 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-
-//= require "alchemy/jquery/plugins/jquery.ui.multiselect"
-//= require "katello/users/user_methods"
-//= require "katello/users/user"
diff --git a/app/assets/javascripts/katello/users/user.js b/app/assets/javascripts/katello/users/user.js
deleted file mode 100644
index 9ed3cf0912d..00000000000
--- a/app/assets/javascripts/katello/users/user.js
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- Copyright 2013 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- */
-
-$(document).ready(function() {
-
-    KT.user_page.registerEdits();
-    env_select.ajax_params ={};
-    env_select.original_env_id = undefined;
-    env_select.env_changed_callback = function(env_id) {
-        if(env_select.original_env_id === env_id) {
-            $('#update_user').addClass('disabled');
-        }else{
-            $('#update_user').removeClass('disabled');
-        }
-    };
-
-    ratings =
-        [{'minScore': 0,
-            'className': 'meterFail',
-            'text': i18n.very_weak
-        },
-            {'minScore': 25,
-                'className': 'meterWarn',
-                'text': i18n.weak
-            },
-            {'minScore': 50,
-                'className': 'meterGood',
-                'text': i18n.good
-            },
-            {'minScore': 75,
-                'className': 'meterExcel',
-                'text': i18n.strong
-            }];
-
-    KT.panel.set_expand_cb(function() {
-        //taken out of user_edit, so it can be resused on accounts
-        $(".multiselect").multiselect({"dividerLocation":0.5, "sortable":false});
-
-        var org_selector = $('#org_id_org_id');
-        org_selector.live('change', function(event) {
-            var refill = $('#env_box');
-            var spinner = $('#org_spinner');
-            var selected_org_id = org_selector.val();
-
-            if(!selected_org_id) {
-                refill.html(i18n.noDefaultEnv);
-                env_select.env_changed_callback('');
-            } else {
-
-                var url = KT.routes.environments_partial_organization_path(selected_org_id),
-                    params = {};
-
-                if (env_select.ajax_params !== undefined) {
-                    params = env_select.ajax_params;
-                }
-                spinner.show();
-                refill.html('');
-                $.ajax({
-                    type: "GET",
-                    url: url,
-                    data: params,
-                    success: function(data) {
-                        refill.html(data);
-                        // On successful update, update the original env id and disable save button
-                        env_select.init();
-                        var env_id = env_select.get_selected_env();
-                        if (!env_id) {
-                            env_id = $(data).find(".path_link.active").attr("data-env_id");
-                        }
-                        env_select.env_changed_callback(env_id);
-                        spinner.hide();
-                    }
-                });
-            }
-        }).live('keypress', function(e) {
-            var keyCode = e.keyCode || e.which;
-            if (keyCode === 38 || keyCode === 40) { // if up or down key is pressed
-               $(this).change(); // trigger the change event
-            }
-        });
-
-        var locale_selector = $('#locale_locale');
-        locale_selector.change(function(event) {
-            $('#locale_form').trigger('submit');
-        });
-
-        //from user.js
-        $('#helptips_enabled').bind('change', KT.user_page.checkboxChanged);
-        $('#legacy_mode').bind('change', KT.user_page.checkboxChanged);
-    });
-
-});
diff --git a/app/assets/javascripts/katello/users/user_methods.js b/app/assets/javascripts/katello/users/user_methods.js
deleted file mode 100644
index 18660dbe1d3..00000000000
--- a/app/assets/javascripts/katello/users/user_methods.js
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- Copyright 2013 Red Hat, Inc.
-
- This software is licensed to you under the GNU General Public
- License as published by the Free Software Foundation; either version
- 2 of the License (GPLv2) or (at your option) any later version.
- There is NO WARRANTY for this software, express or implied,
- including the implied warranties of MERCHANTABILITY,
- NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
- have received a copy of GPLv2 along with this software; if not, see
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-*/
-
-
-KT.user_page = (function() {
-    var clearHelptips = function() {
-        var chkbox = $(this);
-        var url = chkbox.attr("data-url");
-        chkbox.addClass("disabled");
-        $.ajax({
-            type: "POST",
-            url: url,
-            data: {},
-            cache: false,
-            success: function(data) {
-                chkbox.button('destroy');
-                chkbox.text(data);
-                $('#clear_helptips').die('click',clearHelptips);
-            },
-            error: function(data) {
-                chkbox.removeClass("disabled");
-                $('#clear_helptips').live('click',clearHelptips);
-                chkbox.button('option',  'label', data);
-            },
-            complete: function(e) {
-                notices.checkNotices();
-            }
-        });
-    },
-    checkboxChanged = function() {
-        var checkbox = $(this);
-        var name = $(this).attr("name");
-        var options = {};
-        if (checkbox.attr("checked") !== undefined) {
-            options[name] = "1";
-        } else {
-            options[name] = "0";
-        }
-        var url = checkbox.attr("data-url");
-        $.ajax({
-            type: "PUT",
-            url: url,
-            data: options,
-            cache: false,
-            complete: function(e) {
-                notices.checkNotices();
-            }
-        });
-        return false;
-    },
-    updateUser = function() {
-        var button = $(this),
-            url = button.attr("data-url"),
-            env_id = $(".path_link.active").attr('data-env_id'),
-            org_id = $('#org_id_org_id').val();
-
-        button.addClass("disabled");
-        $.ajax({
-            type: "PUT",
-            url: url,
-            data: {"org_id":org_id, "env_id":{"env_id":env_id}},
-            cache: false,
-            success: function(data) {
-                $('#env_name').html(data.env);
-                $('#org_name').html(data.org);
-                env_id = data.env_id;
-                env_select.original_env_id = env_id;
-                env_select.env_changed_callback(env_id);
-            },
-            error: function(e) {
-                button.removeClass('disabled');  // Guarantee button is enabled (should be already, though)
-            }
-        });
-    },
-    updateRoles = function(e) {
-        e.preventDefault();
-        var button = $(this).find('input[type|="submit"]');
-        button.attr("disabled","disabled");
-        $(this).ajaxSubmit({
-            success: function(data) {
-                button.removeAttr('disabled');
-            },
-            error: function(e) {
-                button.removeAttr('disabled');
-            }
-        });
-    },
-    registerEdits = function() {
-        $('#clear_helptips').live('click',clearHelptips);
-        $('#update_user').live('click',updateUser);
-        $('#update_roles').live('submit', updateRoles);
-    };
-
-    return {
-        updateUser: updateUser,
-        checkboxChanged: checkboxChanged,
-        clearHelptips: clearHelptips,
-        updateRoles: updateRoles,
-        registerEdits: registerEdits
-    };
-})();
diff --git a/app/assets/stylesheets/katello/katello.scss b/app/assets/stylesheets/katello/katello.scss
index d746b0f849e..5f3ed446873 100644
--- a/app/assets/stylesheets/katello/katello.scss
+++ b/app/assets/stylesheets/katello/katello.scss
@@ -41,9 +41,6 @@
 @import "katello/generic";
 @import "katello/notifications";
 @import "katello/operations";
-@import "katello/orgs";
-@import "katello/subscriptions";
-@import "katello/systems";
 
 body {
   background-color: white;
diff --git a/app/assets/stylesheets/katello/orgs.scss b/app/assets/stylesheets/katello/orgs.scss
deleted file mode 100644
index 6d3046c7651..00000000000
--- a/app/assets/stylesheets/katello/orgs.scss
+++ /dev/null
@@ -1,60 +0,0 @@
-@import "katello/katello_base";
-
-
-#orgs {
-  #events {
-    table {
-      .column_1 {
-        width: 75px;
-      }
-    }
-  }
-  #show_debug_button {
-    display: none;
-  }
-  #container {
-    .left_panel {
-      #new {
-        width: 10em !important;
-      }
-    }
-    #panel-frame {
-      .tupane_footer {
-        background-color: $g1;
-        text-align: right;
-        @include unselectable();
-        label {
-          color: $g7;
-          padding-left: 4px;
-          line-height: 16px;
-        }
-        input[type="checkbox"]{
-          float: right;
-          margin-top: 2px;
-          display: none;
-        }
-        .fav_spinner {
-          float: right;
-        }
-        .favorite {
-          text-align: left;
-          text-transform: capitalize;
-
-          &:hover {
-            background-position: -624px -16px;
-            @include opacity(.75);
-          }
-          &.selected {
-            background-position: -624px -16px;
-            @include opacity(1);
-          }
-        }
-        .default_org:checked + .label_default_org {
-          .favorite {
-            background-position: -624px -16px;
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/app/assets/stylesheets/katello/subscriptions.scss b/app/assets/stylesheets/katello/subscriptions.scss
deleted file mode 100644
index 605187022c2..00000000000
--- a/app/assets/stylesheets/katello/subscriptions.scss
+++ /dev/null
@@ -1,30 +0,0 @@
-@import "katello/katello_base";
-
-
-#subscriptions {
-  .tall {
-    @extend .block;
-    height: 40px;
-
-    li {
-      padding: 0;
-      height: 1.2em;
-    }
-  }
-  .status_icon {
-    height: 15px;
-    width: 15px;
-    background: $status_icons_green_small;
-    float: left;
-    margin: 1px 1px;
-    &.green {
-     background: $status_icons_green_small;
-    }
-    &.yellow {
-     background: $status_icons_yellow_small;
-    }
-    &.red {
-     background: $status_icons_red_small;
-    }
-  }
-}
diff --git a/app/assets/stylesheets/katello/systems.scss b/app/assets/stylesheets/katello/systems.scss
deleted file mode 100644
index 8d1b141fc6f..00000000000
--- a/app/assets/stylesheets/katello/systems.scss
+++ /dev/null
@@ -1,349 +0,0 @@
-@import "katello/katello_base";
-
-
-#systems {
-  .path_selector {
-    @include border-radius(4px);
-    top: auto;
-  }
-  table {
-    margin-bottom: 4px;
-    td {
-      &.package_select {
-        width: 29px;
-      }
-    }
-  }
-  .tall {
-    @extend .block;
-    height: 40px;
-
-    li {
-      padding: 0;
-      height: 1.2em;
-    }
-    .column_3 {
-      height: 35px;
-    }
-    #new {
-      height: 25px;
-      width: 10em !important;
-    }
-  }
-
-  .edit_select_system_releasever_message {
-    &.error_message {
-      textarea {
-        background: $validation_error_color;
-      }
-    }
-  }
-
-  #facts {
-    table {
-      td {
-        padding-left: 18px;
-      }
-    }
-  }
-  .product {
-    float: left;
-    height: 40px;
-    .status_icon {
-      height: 15px;
-      width: 15px;
-      background: $status_icons_green_small;
-      float: left;
-      margin: 2px 1px 1px 1px;
-      &.green {
-        background: $status_icons_green_small;
-      }
-      &.yellow {
-        background: $status_icons_yellow_small;
-      }
-      &.red {
-        background: $status_icons_red_small;
-      }
-    }
-  }
-  #subscription_filters {
-    width: 524px;
-  }
-  #subscriptions {
-    .labels {
-      overflow: auto;
-    }
-    label { display: block; }
-    .needs_attention { color: red; }
-
-    .lower_content {
-      margin-top: 10px;
-      table {
-        tbody {
-          td:first-child { text-align: left; text-indent: 2px; }
-          td:last-child {
-            font-weight: 500;
-            &:hover {
-              span { color: $kselected_color;}
-              .remove_subscription_img { background: $circle_x_icon_black; }
-              .subscribe { background: $play_icon_black; }
-            }
-          }
-          .subscription_row { margin-left: 19px; }
-          .remove_subscription_img { background: $circle_x_icon_grey; overflow: hidden; margin-right: 2px; margin-top: 2px; }
-          .subscribe { background: $play_icon_grey; overflow: hidden; margin-right: 2px; margin-top: 2px; }
-          span { margin-top: 3px; display: block; float: left; color: #888; }
-          .editable {
-            @include border-radius(0);
-            background: $edit_icon;
-            background-position: 100px 7px;
-            width: 180px;
-            padding: 6px 0px;
-            text-align: center;
-          }
-        }
-      }
-    }
-    .add_subs {
-      float: right;
-      padding-left: 25px;
-    }
-  }
-  .subs {
-    background-color: $white_color;
-    @include border-radius(5px);
-    border: 1px solid $border_color;
-    font-family: $headlinefont;
-    color: #747474;
-    font-size: 14px;
-    height: auto;
-    .subs_text {
-      margin: 8px 0 2px 8px;
-      padding: 0px;
-      float: left;
-      height: 30px;
-      width: 89%;
-      border-bottom: 1px dotted $border_color;
-    }
-    .subs_servicelevel {
-      margin: 6px 0 2px 8px;
-      padding: 6px 0px 0px 0px;
-      background-position: 98% 7px;
-      float: right;
-      height: 30px;
-      width: 83%;
-    }
-    .subs_shadow {
-      height: 36px;
-    }
-    .subs_image_wrapper {
-      height:36px;
-      width: 36px;
-      float: left;
-      @include box-shadow(1px, 1px, 4px, #888);
-      @include border-radius(0 0 5px 0);
-      padding: 0 4px 4px 0;
-    }
-    .subs_image {
-      height: 23px;
-      width: 25px;
-      background: $status_icons_green;
-      float: left;
-      margin: 8px 8px;
-      &.green {
-        background: $status_icons_green;
-      }
-      &.yellow {
-        background: $status_icons_yellow;
-      }
-      &.red {
-        background: $status_icons_red;
-      }
-    }
-    .subs_top {
-      width: 100%;
-      height: 100%;
-      font-size: 15px;
-      border-bottom: 1px solid $border_color;
-      @include border-radius(5px);
-    }
-  }
-  #list-spinner {
-    display: none;
-  }
-  #package_sort {
-    &.ascending {
-      &:after {
-        content: "\00A0\25B2";
-      }
-    }
-    &.descending {
-      &:after {
-        content: "\00A0\25BC";
-      }
-    }
-  }
-  .delete_icon {
-    display: inline;
-    background: $circle_x_icon_black;
-    width: 16px;
-    height: 16px;
-    margin-right: 4px;
-  }
-  .package_icon {
-    display: inline;
-    background: $package_icon_black;
-    width: 16px;
-    height: 16px;
-    margin-right: 4px;
-  }
-  .erratum_icon {
-    display: inline;
-    background: $erratum_icon_black;
-    width: 16px;
-    height: 16px;
-    margin-right: 4px;
-  }
-  .system_group_icon {
-    display: inline;
-    background: $system_group_icon_black;
-    width: 16px;
-    height: 16px;
-    margin-right: 4px;
-  }
-  .summary {
-    background-color: $white_color;
-    @include border-radius(5px);
-    border: 1px solid $border_color;
-    font-family: $headlinefont;
-    color: #747474;
-    font-size: 14px;
-    .summary_text {
-      margin: 8px 0 2px 8px;
-      padding: 0px;
-      float: left;
-    }
-    .packages_icon {
-      height: 23px;
-      width: 16px;
-      background: $check_icon_black;
-      float: left;
-      margin: 8px;
-      &.up_to_date {
-        background: $check_icon_black;
-      }
-      &.out_of_date {
-        background: $warning_icon_black;
-      }
-    }
-    .summary_top {
-      width: 100%;
-      height: 36px;
-      font-size: 15px;
-      @include border-radius(10px);
-    }
-    .summary_left {
-      border-right: 1px solid $border_color;
-      width: 49%;
-      float: left;
-      clear: left;
-    }
-    .summary_right {
-      width: 49%;
-      float: right;
-    }
-    .summary_num {
-      font-size: 24px;
-      color: #999;
-    }
-  }
-  .packages_icon {
-    width: 8px;
-    background: $check_icon_black;
-    float: left;
-    margin-top: 2px;
-    &.up_to_date {
-      background: $check_icon_black;
-    }
-    &.out_of_date {
-      background: $warning_icon_black;
-    }
-  }
-
-  #errata_header {
-    margin: 0 20px 10px 20px;
-
-    h5 {
-      margin: 0;
-      border-right: 2px solid $border_color;
-      padding: 1px 10px 1px 0;
-      font-size: 125%;
-    }
-
-    #display_errata_type {
-      margin: 0 0 0px 15px;
-      font-size: 110%;
-      padding: 2px 5px;
-    }
-
-    span { margin-right: 15px; }
-  }
-
-  #errata_container {
-    .errata_status_text { margin-left: 5px; padding: 1px; }
-    .grid_4{ margin-left: 0; margin-right: 0; }
-  }
-
-  #load_more_errata {
-    margin-left: 20px;
-  }
-  #create_system_group {
-    color: $kprimary_color !important;
-    padding-left: 10px;
-    font-weight: bolder;
-  }
-}
-
-#system_group_systems{
-  .st_button {
-    padding: 0;
-    margins: 0;
-  }
-  .input_error {
-    border-color: $error_color;
-  }
-  .remove_spinner{
-    margin-right: 30px;
-  }
-  .stub {
-    @include unselectable;
-  }
-}
-#details_table {
-  border: none;
-  margin-top: 2px;
-
-  tr.interface_name {
-    text-align:right;
-    border-right: 1px solid #C9C9C9;
-    padding-top:0px;
-    padding-left:0px;
-  }
-  tr.interface_addr {
-    text-align:left;
-    padding-top:0px;
-  }
-  tr:last-child td {
-    padding-bottom:0px;
-  }
-}
-
-#subscription_filters {
-  width: 100%;
-}
-
-.nutupane-details .spinner {
-  background: $spinner_img;
-  display: inline-block;
-  margin-top: 12px;
-}
diff --git a/app/controllers/katello/errata_controller.rb b/app/controllers/katello/errata_controller.rb
deleted file mode 100644
index 34716b4776c..00000000000
--- a/app/controllers/katello/errata_controller.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# Copyright 2013 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
-module Katello
-class ErrataController < Katello::ApplicationController
-  before_filter :lookup_errata, except: [:auto_complete]
-  before_filter :find_filter
-  before_filter :authorize
-
-  def rules
-    view = lambda do
-      !Repository.readable_in_org(current_organization).where(
-          :pulp_id => @errata.repoids).empty?
-    end
-
-    auto_complete = lambda do
-      if @def_filter
-        @def_filter.content_view_definition.readable?
-      else
-        false
-      end
-    end
-
-    {
-        :show => view,
-        :packages => view,
-        :short_details => view,
-        :auto_complete => auto_complete
-    }
-  end
-
-  def show
-    render :partial => "show"
-  end
-
-  def packages
-    render :partial => "packages"
-  end
-
-  def short_details
-    render :partial => "short_details"
-  end
-
-  def auto_complete
-    if @def_filter
-      repos = @def_filter.products.map { |prod| prod.repos(current_organization.library) }.flatten
-      repos += @def_filter.repositories
-      results = Errata.autocomplete_search("#{params[:term]}*", repos.map(&:pulp_id))
-      results = results.map { |erratum| {label: erratum.id_title, value: erratum.errata_id} }
-    end
-
-    render :json => results
-  end
-
-  private
-
-  def lookup_errata
-    @errata = Errata.find(params[:id])
-  end
-
-  def find_filter
-    @def_filter = Filter.find_by_id(params[:filter_id])
-  end
-
-end
-end
diff --git a/app/controllers/katello/organizations_controller.rb b/app/controllers/katello/organizations_controller.rb
index 6395085b55b..48f3182a7c6 100644
--- a/app/controllers/katello/organizations_controller.rb
+++ b/app/controllers/katello/organizations_controller.rb
@@ -14,52 +14,12 @@
 module Katello
 class OrganizationsController < Katello::ApplicationController
 
-  respond_to :html, :js
-  before_filter :find_organization, :only => [:edit, :update, :destroy, :events, :default_info]
-  before_filter :find_organization_by_id, :only => [:environments_partial, :download_debug_certificate]
-  before_filter :authorize #call authorize after find_organization so we call auth based on the id instead of cp_id
-  before_filter :setup_options, :only => [:index, :items]
   before_filter :search_filter, :only => [:auto_complete_search]
-  skip_before_filter :require_org
 
   def rules
-    index_test = lambda{Organization.any_readable?}
-    create_test = lambda{Organization.creatable?}
-    read_test = lambda{@organization.readable?}
-    edit_test = lambda{@organization.editable?}
-    delete_test = lambda{@organization.deletable?}
-
-    environments_partial_test = lambda do
-      if "true" == params[:new]
-        User.creatable?
-      else
-        params[:user_id] &&
-            ((current_user.id.to_s == params[:user_id].to_s) || current_user.editable?)
-      end
-    end
-
     {
-      :index => index_test,
-      :items => index_test,
-      :show => index_test,
-      :auto_complete_search => index_test,
-      :new => create_test,
-      :create => create_test,
-      :default_label => create_test,
-      :edit => read_test,
-      :update => edit_test,
-      :destroy => delete_test,
-      :environments_partial => environments_partial_test,
-      :events => read_test,
-      :download_debug_certificate => edit_test,
-      :default_info => read_test
-    }
-  end
-
-  def param_rules
-    {
-      :create => {:organization => [:name, :description, :label], :environment => [:name, :description, :label]},
-      :update => {:organization  => [:name, :description, :service_level]}
+      :auto_complete_search => lambda{Organization.any_readable?},
+      :default_label => lambda{Organization.creatable?}
     }
   end
 
@@ -67,209 +27,8 @@ def section_id
     'operations'
   end
 
-  def menu_definition
-    {:index => :admin_menu}.with_indifferent_access
-  end
-
-  def items
-    ids = Organization.without_deleting.readable.collect(&:id)
-    render_panel_direct(Organization, @panel_options, params[:search], params[:offset] || 0, [:name_sort, 'asc'],
-                        { :default_field => :name, :filter => [{ "id" => ids }] })
-  end
-
-  def show
-    if params[:id] == 'new'
-      render :partial => "new"
-    else
-      find_organization
-      render :partial => "katello/common/list_update",
-             :locals => { :item => @organization, :accessor => 'label', :columns => ['name'] }
-    end
-  end
-
-  # TODO: break up method
-  # rubocop:disable MethodLength
-  def create
-    org_label_assigned = ""
-    org_params = params[:organization]
-    return render_bad_parameters if org_params.nil?
-    org_params[:label], org_label_assigned = generate_label(org_params[:name], 'organization') if org_params[:label].blank?
-    @organization = Organization.new(:name => org_params[:name], :label => org_params[:label], :description => org_params[:description])
-    @organization.save!
-
-    env_label_assigned = ""
-    env_params = params[:environment]
-    if env_params[:name].present?
-      if env_params[:label].blank?
-        env_params[:label], env_label_assigned = generate_label(env_params[:name], 'environment') if env_params[:label].blank?
-      end
-
-      @new_env = KTEnvironment.new(:name => env_params[:name], :label => env_params[:label], :description => env_params[:description])
-      @new_env.organization = @organization
-      @new_env.prior = @organization.library
-      @new_env.save!
-    elsif env_params[:label].present?
-      @new_env = @organization.library
-    end
-
-    notify.success _("Organization '%s' was created.") % @organization["name"]
-    notify.message org_label_assigned unless org_label_assigned.blank?
-
-    if search_validate(Organization, @organization.id, params[:search])
-      if @new_env.nil?
-        notify.message _("Click on 'Add Environment' to create the first environment")
-      else
-        notify.message env_label_assigned unless env_label_assigned.blank?
-      end
-      render :partial => "katello/common/list_item",
-             :locals => { :item => @organization, :accessor => "label",
-                          :columns => ['name'], :name => controller_display_name }
-    else
-      notify.message _("'%s' did not meet the current search criteria and is not being shown.") % @organization["name"]
-      render :json => { :no_match => true }
-    end
-
-  ensure
-    if @organization && @organization.persisted? && @new_env && @new_env.new_record?
-      OrganizationDestroyer.destroy(@organization, :async => false, :notify => false, :user => User.hidden.first)
-    end
-  end
-
-  def edit
-    @org_label = ""
-    user_default_org = current_user.default_org
-    if user_default_org && !user_default_org.nil?
-      if user_default_org == @organization
-        @org_label = _("This is your default organization.")
-      else
-        @org_label = _("Make this my default organization.")
-      end
-    else
-      @org_label = _("Make this my default organization.")
-    end
-    @env_choices =  @organization.environments.collect {|p| [p.name, p.name]}
-    render :partial => "edit", :locals => {:organization => @organization, :editable => @organization.editable?, :name => controller_display_name, :org_label => @org_label}
-  end
-
-  def update
-    return render_bad_parameters unless params[:organization]
-    result = params[:organization].values.first
-
-    @organization.name = params[:organization][:name] unless params[:organization][:name].nil?
-
-    unless params[:organization][:description].nil?
-      result = @organization.description = params[:organization][:description].gsub("\n", '')
-    end
-
-    unless params[:organization][:service_level].nil?
-      result = @organization.service_level = params[:organization][:service_level]
-    end
-
-    @organization.save!
-    notify.success _("Organization '%s' was updated.") % @organization["name"]
-
-    if !search_validate(Organization, @organization.id, params[:search])
-      notify.message _("'%s' no longer matches the current search criteria.") % @organization["name"],
-                     :asynchronous => false
-    end
-
-    render :text => escape_html(result)
-  end
-
-  def destroy
-    found_errors = @organization.validate_destroy(current_organization)
-    if found_errors
-      notify.error found_errors
-      render :text => found_errors[1], :status => :bad_request
-      return
-    end
-
-    # log off all users for this organization
-    # TODO: since we use cookie-based session this is not possible (need to switch over to db-based sessions first)
-
-    # schedule background deletion
-    id = @organization.label
-    OrganizationDestroyer.destroy @organization, :notify => true
-    notify.success _("Organization '%s' has been scheduled for background deletion.") % @organization.name
-    render :partial => "katello/common/list_remove",
-           :locals => { :id => id, :name => controller_display_name }
-  end
-
-  def environments_partial
-    @organization = Organization.find(params[:id])
-    env_user_id = params[:user_id] ? params[:user_id].to_s : nil
-    if env_user_id == current_user.id.to_s && (!current_user.editable?)
-      accessible_envs = KTEnvironment.systems_registerable(@organization)
-    else
-      accessible_envs = KTEnvironment.where(:organization_id => @organization.id)
-    end
-
-    setup_environment_selector(@organization, accessible_envs)
-    @environment = first_env_in_path(accessible_envs, true, @organization)
-    render :partial => "environments", :locals => {:accessible_envs => accessible_envs}
-  end
-
-  def events
-    entries = @organization.events.collect do |e|
-      entry = {}
-      entry['timestamp'] = Date.parse(e['timestamp'])
-      entry['message'] = e['messageText']
-      entry
-    end
-    #entries.compact!  # To remove the nils inserted for rejected entries
-
-    # TODO: add more/paging to these results instead of truncating at 250
-    render :partial => 'events', :locals => {:entries => entries[0...250]}
-  end
-
-  def download_debug_certificate
-    pem = @organization.debug_cert
-    data = "#{pem[:key]}\n\n#{pem[:cert]}"
-    send_data data,
-      :filename => "#{@organization.name}-key-cert.pem",
-      :type => "application/text"
-  end
-
-  def default_info
-    Organization.check_informable_type!(params[:informable_type])
-    task = TaskStatus.find_by_id(@organization.apply_info_task_id)
-    task_state = (task.blank? ? nil : task.state)
-    task_uuid = (task.blank? ? nil : task.uuid)
-    render :partial => "default_info",
-           :locals => { :org => @organization, :informable_type => params[:informable_type], :task_state => task_state, :task_uuid => task_uuid }
-  end
-
   protected
 
-  def find_organization
-    @organization = Organization.find_by_label(params[:id].to_s)
-    if @organization.blank?
-      message = _("Couldn't find organization with ID %s") % params[:id]
-      notify.error message
-      execute_after_filters
-      render :text => message, :status => :not_found
-      return false
-    end
-  end
-
-  def find_organization_by_id
-    @organization = Organization.find(params[:id])
-  end
-
-  def setup_options
-    @panel_options = { :title => _('Organizations'),
-                       :col => ['name'],
-                       :titles => [_('Name')],
-                       :create => _('Organization'),
-                       :create_label => _('+ New Organization'),
-                       :name => controller_display_name,
-                       :accessor => :label,
-                       :ajax_load  => true,
-                       :ajax_scroll => items_organizations_path,
-                       :enable_create => Organization.creatable?,
-                       :search_class => Organization}
-  end
-
   def search_filter
     @filter = {:organization_id => current_organization}
   end
diff --git a/app/controllers/katello/products_controller.rb b/app/controllers/katello/products_controller.rb
index 7939dc06dbf..f269d7f02c3 100644
--- a/app/controllers/katello/products_controller.rb
+++ b/app/controllers/katello/products_controller.rb
@@ -14,29 +14,15 @@ module Katello
 class ProductsController < Katello::ApplicationController
   respond_to :html, :js
 
-  before_filter :find_product, :only => [:edit, :update, :destroy, :refresh_content, :disable_content]
-  before_filter :find_provider, :only => [:new, :default_label, :edit, :update, :destroy,
-                                          :refresh_content, :disable_content]
-  before_filter :find_or_create_provider, :only => [:create]
   before_filter :authorize
 
   def rules
-    read_test = lambda{@provider.readable?}
-    edit_test = lambda{@provider.editable?}
-    auto_complete_test = lambda {Product.any_readable?(current_organization)}
+    read_test = lambda {Product.any_readable?(current_organization)}
 
     {
-      :index => lambda {Product.any_readable?(current_organization)},
-      :all => lambda {Product.any_readable?(current_organization)},
-      :new => edit_test,
-      :create => edit_test,
-      :default_label => edit_test,
-      :edit => read_test,
-      :update => edit_test,
-      :destroy => edit_test,
-      :auto_complete =>  auto_complete_test,
-      :refresh_content => edit_test,
-      :disable_content => edit_test,
+      :index => read_test,
+      :all => read_test,
+      :auto_complete =>  read_test
     }
   end
 
@@ -49,85 +35,7 @@ def index
   end
 
   def all
-    redirect_to action: 'index', :anchor => '/products'
-  end
-
-  def new
-    render :partial => "new"
-  end
-
-  def edit
-    render :partial => "edit", :locals => {:editable => @provider.editable?}
-  end
-
-  def create
-    product_params = params[:product]
-    requested_label = String.new(product_params[:label]) unless product_params[:label].blank?
-    product_params[:label], _ = generate_label(product_params[:name], 'product') if product_params[:label].blank?
-
-    gpg = GpgKey.readable(current_organization).find(product_params[:gpg_key]) if product_params[:gpg_key] && product_params[:gpg_key] != ""
-    product = @provider.add_custom_product(product_params[:label], product_params[:name],
-                                           product_params[:description], product_params[:url], gpg)
-
-    notify.success _("Product '%s' created.") % product_params[:name]
-
-    if requested_label.blank?
-      notify.message default_label_assigned(product)
-    elsif requested_label != product.label
-      notify.message label_overridden(product, requested_label)
-    end
-    render :json => {:id => product.id}
-  end
-
-  def refresh_content
-    if @product.custom?
-      render_bad_parameters _('Repository sets are enabled by default for custom products.')
-    else
-      pc = @product.refresh_content(params[:content_id])
-      render :partial => 'katello/providers/redhat/repos', :locals => { :product_content => pc }
-    end
-  end
-
-  def disable_content
-    if @product.custom?
-      render_bad_parameters _('Repository sets cannot be disabled for custom products.')
-    else
-      render :json => @product.disable_content(params[:content_id])
-    end
-  end
-
-  def update
-    result = params[:product].values.first
-    @product.name = params[:product][:name] if params[:product][:name]
-    @product.description = params[:product][:description] if params[:product][:description]
-
-    if params[:product].key?(:gpg_key)
-      if params[:product][:gpg_key] != ""
-        @product.gpg_key = GpgKey.readable(current_organization).find(params[:product][:gpg_key])
-        result = @product.gpg_key.id.to_s
-      else
-        @product.gpg_key = nil
-        result = ""
-      end
-    end
-
-    if params[:product].fetch(:gpg_all_repos, 'false').to_bool
-      notify.success _("All repository GPG keys for Product '%s' were updated.") % @product.name
-      @product.reset_repo_gpgs!
-    else
-      notify.success _("Product '%s' was updated.") % @product.name
-    end
-
-    @product.save!
-
-    render :text => escape_html(result)
-  end
-
-  def destroy
-    @product.destroy
-    notify.success _("Product '%s' removed.") % @product[:name]
-    render :partial => "katello/common/post_delete_close_subpanel",
-           :locals => { :path => products_repos_provider_path(@product.provider_id) }
+    redirect_to :action => 'index', :anchor => '/products'
   end
 
   def auto_complete
@@ -144,21 +52,5 @@ def auto_complete
     render :json => Util::Support.array_with_total
   end
 
-  protected
-
-  def find_provider
-    @provider = @product.provider if @product  #don't trust the provider_id coming in if we don't need it
-    @provider ||= Provider.find(params[:provider_id])
-  end
-
-  def find_or_create_provider
-    find_provider
-    @provider ||= Provider.create_anonymous!(current_organization)
-  end
-
-  def find_product
-    @product = Product.find(params[:id])
-  end
-
 end
 end
diff --git a/app/controllers/katello/puppet_modules_controller.rb b/app/controllers/katello/puppet_modules_controller.rb
deleted file mode 100644
index 2181184b510..00000000000
--- a/app/controllers/katello/puppet_modules_controller.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Copyright 2013 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
-module Katello
-class PuppetModulesController < Katello::ApplicationController
-  before_filter :find_puppet_module, only: [:show]
-  before_filter :find_filter, except: [:show]
-  before_filter :authorize
-
-  def rules
-    view = lambda do
-      !Repository.readable_in_org(current_organization).where(
-          :pulp_id => @puppet_module.repoids).empty?
-    end if @puppet_module
-
-    auto_complete = lambda { @def_filter.content_view_definition.readable? }
-
-    {
-      :auto_complete => auto_complete,
-      :author_auto_complete => auto_complete,
-      :show => view
-    }
-  end
-
-  def auto_complete
-    if @def_filter
-      repoids = @def_filter.repos(current_organization.library).map(&:pulp_id)
-      results = PuppetModule.autocomplete_name("#{params[:term]}*", repoids)
-    end
-
-    render :json => results
-  end
-
-  def author_auto_complete
-    if @def_filter
-      name = params[:module_name]
-      repoids = @def_filter.repos(current_organization.library).map(&:pulp_id)
-      results = PuppetModule.autocomplete_author("#{params[:term]}*", repoids, 15, name)
-    end
-
-    render :json => results
-  end
-
-  def show
-    render :partial => "show"
-  end
-
-  private
-
-  def find_filter
-    @def_filter = Filter.find(params[:filter_id])
-  end
-
-  def find_puppet_module
-    @puppet_module = PuppetModule.find(params[:id])
-  end
-
-end
-end
diff --git a/app/controllers/katello/subscriptions_controller.rb b/app/controllers/katello/subscriptions_controller.rb
index 834c957430b..4972a34a25d 100644
--- a/app/controllers/katello/subscriptions_controller.rb
+++ b/app/controllers/katello/subscriptions_controller.rb
@@ -11,308 +11,26 @@
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
 require 'ostruct'
 
-# TODO: index provided products fields for better search
-# TODO: start / end dates in left subscriptions list
-# TODO: start date range not working?  start:2012-01-31 fails but start:"2012-01-31" works
-
 module Katello
 class SubscriptionsController < Katello::ApplicationController
 
   before_filter :find_provider
-  before_filter :find_subscription, :except => [:index, :items, :new, :upload, :delete_manifest,
-                                                :history, :history_items, :edit_manifest,
-                                                :refresh_manifest, :all]
   before_filter :authorize
-  before_filter :setup_options, :only => [:index, :items]
-
-  # two pane columns and mapping for sortable fields
-  COLUMNS = {'name' => 'name_sort'}
 
   def rules
     read_provider_test = lambda{@provider.readable?}
-    edit_provider_test = lambda{@provider.editable?}
     {
       :index => read_provider_test,
-      :all => read_provider_test,
-      :items => read_provider_test,
-      :edit => read_provider_test,  # Note: edit is the callback for sliding out right panel
-      :products => read_provider_test,
-      :consumers => read_provider_test,
-      :history => read_provider_test,
-      :history_items => read_provider_test,
-      :new => read_provider_test,
-      :upload => edit_provider_test,
-      :refresh_manifest => edit_provider_test,
-      :delete_manifest => edit_provider_test,
-      :edit_manifest => read_provider_test
-    }
-  end
-
-  def param_rules
-    {
-        # empty
+      :all => read_provider_test
     }
   end
 
   def index
-    if current_user.legacy_mode
-      # If no manifest imported yet or one is currently being imported, open the "new" panel.
-      # Originally had intended to open the "new" panel when last import was an error, but this
-      # is too restrictive, preventing viewing of previously imported subscriptions.
-      if @provider.editable?
-        details = current_organization.owner_details
-        if (details['upstreamConsumer'].nil? ||
-            (!@provider.task_status.nil? && !@provider.task_status.finish_time))
-          @panel_options[:initial_state] = {:panel => :new}
-        end
-      end
-
-      render :index
-    else
-      render 'bastion/layouts/application', :layout => false
-    end
+    render 'bastion/layouts/application', :layout => false
   end
 
   def all
-    redirect_to action: 'index', anchor: '/subscriptions'
-  end
-
-  def items
-    query_string = params[:search]
-    offset = params[:offset].to_i || 0
-    filters = []
-
-    # Limit subscriptions to current org and Red Hat provider
-    filters << {:term => {:org => current_organization.label}}
-    filters << {:term => {:provider_id => @provider.id}}
-    # Date range filters for expiration. These are few and don't fit into search dropdown
-    # capabilities so for now get name of expiration filter from querystring.
-    filters << Pool.expiration_filter(params[:expiration_filter])
-    filters.compact!
-
-    options = {
-        :filters => filters,
-        :load_records? => false,
-        :default_field => :name
-    }
-    options[:page_size] = params[:page_size] || current_user.page_size
-    params[:sort_by] ||= :name_sort
-    params[:sort_order] ||= 'ASC'
-    options.merge!(params.slice(:sort_by, :sort_order))
-
-    # Without any search terms, reindex all subscriptions in elasticsearch. This is to insure
-    # that the latest information is searchable.
-    if offset == 0 && query_string.blank?
-      @provider.index_subscriptions
-    end
-
-    items = Glue::ElasticSearch::Items.new(Pool)
-    subscriptions, total_count = items.retrieve(query_string, offset, options)
-    @panel_options[:total_count] = total_count
-
-    render_panel_results(subscriptions, items.total_items, @panel_options)
-  end
-
-  def edit
-    render :partial => "edit", :locals => {:subscription => @subscription, :editable => false, :name => controller_display_name}
-  end
-
-  def products
-    render :partial => "products", :locals => {:subscription => @subscription, :editable => false, :name => controller_display_name}
-  end
-
-  def consumers
-    systems = current_organization.systems.readable(current_organization)
-    systems = systems.all_by_pool(@subscription.cp_id)
-
-    activation_keys = ActivationKey.joins(:pools).where("#{Katello::Pool.table_name}.cp_id" => @subscription.cp_id).readable(current_organization)
-    activation_keys = [] if !activation_keys
-
-    distributors = current_organization.distributors.readable(current_organization)
-    distributors = distributors.all_by_pool(@subscription.cp_id)
-
-    render :partial => "consumers", :locals => {:subscription => @subscription,
-                                                :systems => systems,
-                                                :activation_keys => activation_keys,
-                                                :distributors => distributors,
-                                                :editable => false,
-                                                :name => controller_display_name}
-  end
-
-  def new
-    get_manifest_details
-    can_refresh = @upstream['idCert'] && @upstream['idCert']['cert']
-    render :partial => "new", :locals => {:provider => @provider, :statuses => @statuses, :details => @details, :upstream => @upstream,
-                                          :name => controller_display_name, :can_refresh => can_refresh}
-  end
-
-  def edit_manifest
-    get_manifest_details
-    render :partial => "edit_manifest", :locals => {:provider => @provider, :statuses => @statuses, :details => @details, :upstream => @upstream, :name => controller_display_name}
-  end
-
-  def history
-    begin
-      @statuses = @provider.owner_imports
-    rescue # rubocop:disable HandleExceptions
-      # quietly ignore
-    end
-    render :template => "katello/subscriptions/_history", :locals => {:provider => @provider, :statuses => @statuses, :name => controller_display_name}
-  end
-
-  def history_items
-    begin
-      @statuses = @provider.owner_imports
-    rescue => error
-      @statuses = []
-      display_message = parse_display_message(error.response)
-      error_text = _("Unable to retrieve subscription history for provider '%{name}'." % {:name => @provider.name})
-      error_text += _("%{newline}Reason: %{reason}" % {:reason => display_message, :newline => "<br />"}) unless display_message.blank?
-      notify.exception error_text, error, :asynchronous => true
-      Rails.logger.error "Error fetching subscription history from Candlepin"
-      Rails.logger.error error
-      Rails.logger.error error.backtrace.join("\n")
-      render :partial => "history_items", :status => :bad_request, :locals => {:provider => @provider, :name => controller_display_name, :statuses => @statuses}
-      return
-    end
-
-    render :partial => "history_items", :locals => {:provider => @provider, :name => controller_display_name, :statuses => @statuses}
-  end
-
-  def delete_manifest
-    begin
-      @provider.delete_manifest :async => true, :notify => true
-    rescue => error
-      if error.respond_to?(:response)
-        display_message = Katello::ApplicationController.parse_display_message(error.response)
-      elsif error.message
-        display_message = error.message
-      else
-        display_message = ""
-      end
-
-      notify.exception @provider.delete_error_message(display_message), error
-    end
-
-    render :json => {'state' => 'running'}
-  end
-
-  def upload
-    if !params[:provider].blank? && params[:provider].key?(:contents)
-      begin
-        temp_file_path = create_temp_file('import') {|tmp| tmp.write params[:provider][:contents].read }
-        # force must be a string value
-        force_update = params[:force_import] == "1" ? "true" : "false"
-        @provider.import_manifest File.expand_path(temp_file_path), :force => force_update,
-                                                                    :async => true, :notify => true
-      rescue => error
-        if error.respond_to?(:response)
-          display_message = Katello::ApplicationController.parse_display_message(error.response)
-        elsif error.message
-          display_message = error.message
-        else
-          display_message = ""
-        end
-
-        notify.exception @provider.import_error_message(display_message), error
-
-        Rails.logger.error "error uploading subscriptions."
-        Rails.logger.error error
-        Rails.logger.error error.backtrace.join("\n")
-        # Fall-through even on error so that the import history is refreshed
-      end
-    else
-      # user didn't provide a manifest to upload
-      notify.error _("Subscription manifest must be specified on upload.")
-    end
-
-    render :json => {'state' => 'running'}
-  end
-
-  def refresh_manifest
-    begin
-      get_manifest_details # to set @upstream
-      @provider.refresh_manifest @upstream, :async => true, :notify => true
-    rescue => error
-      if error.respond_to?(:response)
-        display_message = Katello::ApplicationController.parse_display_message(error.response)
-      elsif error.message
-        display_message = error.message
-      else
-        display_message = ""
-      end
-
-      notify.exception @provider.refresh_error_message(display_message), error
-    end
-
-    render :json => {'state' => 'running'}
-  end
-
-  def section_id
-    'subscriptions'
-  end
-
-  private
-
-  def get_manifest_details
-    @details = current_organization.owner_details
-    @statuses = @provider.owner_imports || []
-    @upstream =  @details['upstreamConsumer'].blank? ? {} : @details['upstreamConsumer']
-
-    # Put some manifest-specific information onto the consumer for use in the view
-    import_status = @statuses.find {|s| s['upstreamId'] == @upstream['uuid']}
-    if !import_status.blank?
-      @upstream['generatedBy'] = import_status['generatedBy']
-      @upstream['generatedDate'] = import_status['generatedDate']
-      @upstream['fileName'] = import_status['fileName']
-    end
-  end
-
-  def find_or_create_temp_dir
-    dir = "#{Rails.root}/tmp"
-    Dir.mkdir(dir) unless File.directory? dir
-    dir
-  end
-
-  def create_temp_file(prefix)
-    # default external encoding in Ruby 1.9.3 is UTF-8, need to specify that we are opening a binary file (ASCII-8BIT encoding)
-    f = File.new(
-        File.join(find_or_create_temp_dir, "#{prefix}_#{SecureRandom.hex(10)}.zip"), 'wb+', 0600)
-
-    yield f if block_given?
-    f.path
-  ensure
-    f.close unless f.nil?
-  end
-
-  def split_order(order)
-    if order
-      order.split
-    else
-      [:name_sort, "ASC"]
-    end
-  end
-
-  def find_subscription
-    @subscription = Katello::Pool.find_pool(params[:id])
-  end
-
-  def setup_options
-    @panel_options = { :title => _('Subscriptions'),
-                       :col => ["name"],
-                       :titles => [_("Name")],
-                       :custom_rows => true,
-                       :enable_create => @provider.editable?,
-                       :create_label => _("+ Import Manifest"),
-                       :enable_sort => true,
-                       :name => controller_display_name,
-                       :list_partial => 'katello/subscriptions/list_subscriptions',
-                       :ajax_load  => true,
-                       :ajax_scroll => items_subscriptions_path,
-                       :actions => nil,
-                       :search_class => Katello::Pool,
-                       :accessor => 'unused'
-                      }
+    redirect_to :action => 'index', :anchor => '/subscriptions'
   end
 
   def controller_display_name
diff --git a/app/controllers/katello/system_errata_controller.rb b/app/controllers/katello/system_errata_controller.rb
deleted file mode 100644
index 22c5a8d0f70..00000000000
--- a/app/controllers/katello/system_errata_controller.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-#
-# Copyright 2013 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
-module Katello
-class SystemErrataController < Katello::ApplicationController
-
-  before_filter :find_system, :only => [:install, :index, :items, :errata_status]
-  before_filter :authorize
-
-  def section_id
-    'systems'
-  end
-
-  def rules
-    edit_system = lambda{System.find(params[:system_id]).editable?}
-    read_system = lambda{System.find(params[:system_id]).readable?}
-
-    {
-      :index => read_system,
-      :items => read_system,
-      :install => edit_system,
-      :errata_status => edit_system
-    }
-  end
-
-  def index
-    if @system.class == Hypervisor
-      render :partial => "katello/systems/hypervisor",
-             :locals => {:system => @system,
-                         :message => _("Hypervisors do not have errata")}
-      return
-    end
-
-    offset = current_user.page_size
-
-    render :partial => "katello/systems/errata/index",
-           :locals => {:system => @system, :editable => @system.editable?, :offset => offset}
-  end
-
-  def items
-    offset = params[:offset]
-    filter_type = params[:filter_type] if params[:filter_type]
-    errata_state = params[:errata_state] if params[:errata_state]
-    chunk_size = current_user.page_size
-    errata, total_count, results_count = get_errata(offset.to_i, offset.to_i + chunk_size, filter_type, errata_state)
-
-    return render_bad_parameters unless errata
-
-    rendered_html = render_to_string(:partial => "katello/systems/errata/items", :locals => { :errata => errata, :editable => @system.editable? })
-    render :json => {:html => rendered_html,
-                     :results_count => results_count,
-                     :total_count => total_count,
-                     :current_count => errata.length + offset.to_i }
-  end
-
-  def install
-    task = @system.install_errata(params[:errata_ids])
-
-    notify.success _("Errata scheduled for install.")
-    render :text => task.id
-  end
-
-  def errata_status
-    if params[:id]
-      statuses = @system.tasks.where('task_statuses.id' => params[:id], :task_type => [:errata_install])
-    else
-      statuses = @system.tasks.where(:task_type => [:errata_install], :state => [:waiting, :running])
-    end
-    render :json => statuses
-  end
-
-  private
-
-  include SortColumnList
-  include Util::Errata
-
-  def get_errata(start, finish, filter_type = "All", errata_state = "outstanding")
-    errata_state = errata_state || "outstanding"
-    filter_type = filter_type || "All"
-
-    errata_list = @system.errata
-    total_errata_count = errata_list.length
-
-    errata_list = filter_by_type(errata_list, filter_type)
-    errata_list = filter_by_state(errata_list, errata_state)
-
-    filtered_errata_count = errata_list.length
-
-    errata_list = errata_list.sort_by{ |a| a.errata_id.downcase}
-    errata_list = errata_list[start...finish]
-
-    return errata_list, total_errata_count, filtered_errata_count
-  end
-
-  def find_system
-    @system = System.find(params[:system_id])
-  end
-
-end
-end
diff --git a/app/controllers/katello/system_events_controller.rb b/app/controllers/katello/system_events_controller.rb
deleted file mode 100644
index d419f051c6a..00000000000
--- a/app/controllers/katello/system_events_controller.rb
+++ /dev/null
@@ -1,110 +0,0 @@
-#
-# Copyright 2013 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
-module Katello
-class SystemEventsController < Katello::ApplicationController
-  before_filter :find_system
-  before_filter :authorize
-
-  def section_id
-    'systems'
-  end
-
-  def rules
-    read_system = lambda{@system.readable?}
-
-    {
-      :index => read_system,
-      :items => read_system,
-      :show => read_system,
-      :event_status => read_system,
-      :more_events => read_system
-    }
-  end
-
-  def index
-    render :partial => "katello/system_events/events", :locals => {:system => @system, :tasks => tasks}
-  end
-
-  def show
-    # details
-    task = @system.tasks.where("#{TaskStatus.table_name}.id" => params[:id]).first
-    task_template = TaskStatus::TYPES[task.task_type]
-    type = task_template[:name]
-    if task_template[:user_message]
-      user_message = task_template[:user_message] % task.user.login
-    else
-      user_message = task_template[:english_name]
-    end
-    render :partial => "katello/system_events/details", :locals => {:type => type, :user_message => user_message,
-                                                                    :system => @system, :task => task}
-  end
-
-  # retrieve the status for the actions initiated by the client
-  def event_status
-    statuses = {:tasks => []}
-    @system.tasks.where(:id => params[:task_id]).collect do |status|
-      statuses[:tasks] << {
-        :id => status.id,
-        :pending? => status.pending?,
-        :status_html => render_to_string(:template => 'katello/system_events/_event_items', :layout => false,
-                                         :locals => {:include_tr => false, :system => @system, :t => status})
-      }
-    end
-    render :json => statuses
-  end
-
-  def more_events
-    offset = params[:offset].try(:to_i) || current_user.page_size
-
-    statuses = tasks(current_user.page_size + offset)
-    statuses = statuses[offset..statuses.length]
-    if statuses
-      render(:partial => 'katello/system_events/more_events', :locals => {:cycle_extra => offset.odd?, :system => @system, :tasks => statuses})
-    else
-      render :nothing => true
-    end
-  end
-
-  def items
-    render_proc = lambda do |items, options|
-      if items && !items.empty?
-        render_to_string(:partial => 'katello/system_events/more_events', :locals => {:cycle_extra => false, :system => @system, :tasks => items})
-      else
-        "<tr><td>" + _("No events matching your search criteria.") + "</td></tr>"
-      end
-    end
-    search = params[:search]
-    render_panel_direct(TaskStatus, {:no_search_history => true, :render_list_proc => render_proc},
-                        search, params[:offset], [:finish_time, 'desc'],
-                        :filter => {:task_owner_id => [@system.id], :task_owner_type => [System.class_name]},
-                        :load => true,
-                        :simple_query => "status:#{search} OR #{search}")
-  end
-
-  protected
-
-  def find_system
-    @system = System.find(params[:system_id])
-  end
-
-  helper_method :tasks
-  def tasks(page_size = current_user.page_size)
-    @system.tasks.order("finish_time desc").limit(page_size)
-  end
-
-  helper_method :total_events_length
-  def total_events_length
-    @system.tasks.length
-  end
-end
-end
diff --git a/app/controllers/katello/system_group_errata_controller.rb b/app/controllers/katello/system_group_errata_controller.rb
deleted file mode 100644
index b5014faaf04..00000000000
--- a/app/controllers/katello/system_group_errata_controller.rb
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-# Copyright 2013 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
-module Katello
-class SystemGroupErrataController < Katello::ApplicationController
-
-  helper SystemErrataHelper
-
-  before_filter :find_group, :only => [:install, :index, :items, :errata_status]
-  before_filter :authorize
-
-  def section_id
-    'systems'
-  end
-
-  def rules
-    edit_group = lambda{SystemGroup.find(params[:system_group_id]).systems_editable?}
-    read_group = lambda{SystemGroup.find(params[:system_group_id]).systems_readable?}
-    {
-      :index => read_group,
-      :items => read_group,
-      :install => edit_group,
-      :errata_status => edit_group
-    }
-  end
-
-  def index
-    offset = current_user.page_size
-    render :partial => "katello/system_groups/errata/index",
-           :locals => {:system => @group, :editable => @group.systems_editable?, :offset => offset}
-  end
-
-  def items
-    filter_type = params[:filter_type]
-
-    if filter_type && filter_type != 'All'
-      filter_type.downcase!
-    else
-      filter_type = nil
-    end
-
-    errata = @group.errata(filter_type)
-
-    system_uuids = errata.flat_map{|e| e.applicable_consumers}.uniq
-    system_hash = {}
-    System.where(:uuid => system_uuids).select([:uuid, :name]).each do |sys|
-      system_hash[sys.uuid] = sys
-    end
-
-    errata.each do |erratum|
-      erratum.applicable_consumers = erratum.applicable_consumers.map{|uuid| {:name => system_hash[uuid].name, :uuid => uuid }}
-    end
-
-    rendered_html = render_to_string(:partial => "katello/systems/errata/items",
-                                     :locals => { :errata => errata,
-                                                  :editable => @group.systems_editable? })
-
-    render :json => {:html => rendered_html,
-                     :results_count => errata.length,
-                     :total_count => errata.length,
-                     :current_count => errata.length  }
-  end
-
-  def install
-    errata_ids = params[:errata_ids]
-    job = @group.install_errata(errata_ids)
-
-    notify.success _("Install of Errata '%{errata}' scheduled for System Group '%{group}'.") % {:errata => params[:errata_ids], :group => @group.name}
-    render :text => job.id
-
-  rescue Errors::SystemGroupEmptyException => e
-    notify.error _("Install of Errata '%{errata}' scheduled for System Group '%{group}' failed.  Reason: %{message}") % {:errata => params[:errata_ids], :group => @group.name, :message => e.message}
-
-    render :text => ''
-  end
-
-  def errata_status
-    if params[:id]
-      jobs = @group.refreshed_jobs.joins(:task_statuses).where(
-          "#{Katello::Job.table_name}.id" => params[:id],
-          "#{Katello::TaskStatus.table_name}.task_type" => [:errata_install])
-    else
-      jobs = @group.refreshed_jobs.joins(:task_statuses).where(
-          "#{Katello::TaskStatus.table_name}.task_type" => [:errata_install],
-          "#{Katello::TaskStatus.table_name}.state" => [:waiting, :running])
-    end
-    render :json => jobs
-  end
-
-  private
-
-  def find_group
-    @group = SystemGroup.find(params[:system_group_id])
-  end
-
-end
-end
diff --git a/app/controllers/katello/system_group_events_controller.rb b/app/controllers/katello/system_group_events_controller.rb
deleted file mode 100644
index 329a73d1d40..00000000000
--- a/app/controllers/katello/system_group_events_controller.rb
+++ /dev/null
@@ -1,123 +0,0 @@
-#
-# Copyright 2013 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
-module Katello
-class SystemGroupEventsController < Katello::ApplicationController
-  before_filter :find_group
-  before_filter :authorize
-
-  helper SystemGroupEventsHelper
-
-  def section_id
-    'systems'
-  end
-
-  def rules
-    read_group = lambda{@group.readable?}
-
-    {
-      :index => read_group,
-      :items => read_group,
-      :show => read_group,
-      :event_status => read_group,
-      :more_items => read_group
-    }
-  end
-
-  def index
-    render :partial => 'katello/system_groups/events/index', :locals => {:group => @group, :jobs => jobs}
-  end
-
-  def show
-    job = @group.jobs.where("#{Job.table_name}.id" => params[:id]).first
-    if job.nil?
-      render :nothing => true
-    else
-      render :partial => 'katello/system_groups/events/show',
-             :locals => {:group => @group, :job => job}
-    end
-  end
-
-  def event_status
-    # retrieve the status for the actions initiated by the client
-    statuses = {:jobs => [], :tasks => []}
-
-    @group.refreshed_jobs.where(:id => params[:job_id]).collect do |status|
-      statuses[:jobs] << {
-        :id => status.id,
-        :pending? => status.pending?,
-        :status_html => render_to_string(:template => 'katello/system_groups/events/_items', :layout => false,
-                                         :locals => {:include_tr => false, :group => @group, :job => status})
-      }
-    end
-
-    TaskStatus.where(:id => params[:task_id]).collect do |status|
-      statuses[:tasks] << {
-        :id => status.id,
-        :pending? => status.pending?,
-        :status_html => render_to_string(:template => 'katello/system_groups/events/_system_items', :layout => false,
-                                         :locals => {:include_tr => false, :t => status})
-      }
-    end
-
-    render :json => statuses
-  end
-
-  def more_items
-    if params.key?(:offset)
-      offset = params[:offset].to_i
-    else
-      offset = current_user.page_size
-    end
-
-    statuses = jobs(current_user.page_size + offset)
-    statuses = statuses[offset..statuses.length]
-    if statuses
-      render(:partial => 'katello/system_groups/events/more_items', :locals => {:cycle_extra => offset.odd?, :group => @group, :jobs => statuses})
-    else
-      render :nothing => true
-    end
-  end
-
-  def items
-    render_proc = lambda do |items, options|
-      if items && !items.empty?
-        render_to_string(:partial => 'katello/system_groups/events/more_items', :locals => {:cycle_extra => false, :group => @group, :jobs => items})
-      else
-        "<tr><td>" + _("No events matching your search criteria.") + "</td></tr>"
-      end
-    end
-    search = params[:search]
-    render_panel_direct(Job, {:no_search_history => true, :render_list_proc => render_proc},
-                        search, params[:offset] || 0, [:id, 'desc'],
-                        :filter => {:job_owner_id => [@group.id], :task_owner_type => SystemGroup.class.name},
-                        :load => true,
-                        :simple_query => "#{search}")
-  end
-
-  protected
-
-  def find_group
-    @group = SystemGroup.find(params[:system_group_id])
-  end
-
-  helper_method :jobs
-  def jobs(page_size = current_user.page_size)
-    @group.jobs.order('id desc').limit(page_size)
-  end
-
-  helper_method :total_events_length
-  def total_events_length
-    @group.jobs.length
-  end
-end
-end
diff --git a/app/controllers/katello/system_group_packages_controller.rb b/app/controllers/katello/system_group_packages_controller.rb
deleted file mode 100644
index 477c1aa3346..00000000000
--- a/app/controllers/katello/system_group_packages_controller.rb
+++ /dev/null
@@ -1,215 +0,0 @@
-
-#
-# Copyright 2013 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
-module Katello
-class SystemGroupPackagesController < Katello::ApplicationController
-
-  helper SystemPackagesHelper
-
-  before_filter :find_group
-  before_filter :authorize
-
-  def section_id
-    'systems'
-  end
-
-  def rules
-    edit_group = lambda{SystemGroup.find(params[:system_group_id]).systems_editable?}
-    read_group = lambda{SystemGroup.find(params[:system_group_id]).systems_readable?}
-
-    {
-      :index => read_group,
-      :add => edit_group,
-      :remove => edit_group,
-      :update => edit_group,
-      :package_status => edit_group
-    }
-  end
-
-  def index
-    actions = [:package_install, :package_update, :package_remove,
-               :package_group_install, :package_group_remove,
-               :package_group_update]
-    jobs = @group.refreshed_jobs.joins(:task_statuses).where(
-        "#{Katello::TaskStatus.table_name}.task_type" => actions,
-        "#{Katello::TaskStatus.table_name}.state" => [:waiting, :running])
-
-    render :partial => "katello/system_groups/packages/index",
-           :locals => {:jobs => jobs, :editable => @group.systems_editable?}
-  end
-
-  # TODO: break up this method
-  # rubocop:disable MethodLength
-  def add
-    if !params[:packages].blank?
-      # user entered one or more package names (as comma-separated list) in the content box
-      packages = Util::Package.validate_package_list_format(params[:packages])
-
-      if packages
-        job = @group.install_packages packages
-        notify.success _("Install of Packages '%{packages}' scheduled for System Group '%{name}'.") % {:packages => params[:packages], :name => @group.name}
-      else
-        notify.error _("One or more errors found in Package names '%s'.") % params[:packages]
-        render :text => ''
-        return
-      end
-
-    elsif !params[:groups].blank?
-      # user entered one or more package group names (as comma-separated list) in the content box
-      groups = params[:groups].split(/ *, */)
-      job = @group.install_package_groups groups
-      notify.success _("Install of Package Groups '%{groups}' scheduled for System Group '%{name}'.") % {:groups => params[:groups], :name => @group.name}
-    else
-      notify.error _("Empty request received to install Packages or Package Groups for System Group '%s'.") %
-                       @group['name']
-      render :text => ''
-      return
-    end
-
-    render :partial => 'katello/system_groups/packages/items',
-           :locals => { :editable           => @group.systems_editable?,
-                        :group_id           => @group.id,
-                        :job                => job,
-                        :include_tr_shading => false }
-  rescue Errors::SystemGroupEmptyException => e
-    if !params[:packages].blank?
-      notify.error _("Install of Packages '%{packages}' scheduled for System Group '%{name}' failed.  Reason: %{message}") %
-        {:packages => params[:packages], :name => @group.name, :message => e.message}
-    elsif !params[:groups].blank?
-      notify.error _("Install of Package Groups '%{groups}' scheduled for System Group '%{name}' failed.  Reason: %{message}") %
-        {:groups => params[:groups], :name => @group.name, :message => e.message}
-    end
-    render :text => ''
-  end
-
-  # TODO: break up this method
-  # rubocop:disable MethodLength
-  def remove
-    if !params[:packages].blank?
-      # user entered one or more package names (as comma-separated list) in the content box
-      packages = Util::Package.validate_package_list_format(params[:packages])
-
-      if packages
-        job = @group.uninstall_packages packages
-        notify.success _("Uninstall of Packages '%{packages}' scheduled for System Group '%{name}'.") % {:packages => params[:packages], :name => @group.name}
-      else
-        notify.error _("One or more errors found in Package names '%s'.") % params[:packages]
-        render :text => ''
-        return
-      end
-
-    elsif !params[:groups].blank?
-      # user entered one or more package group names (as comma-separated list) in the content box
-      groups = params[:groups].split(/ *, */)
-      job = @group.uninstall_package_groups groups
-      notify.success _("Uninstall of Package Groups '%{groups}' scheduled for System Group '%{name}'.") %
-        {:group => groups.join(','), :name => @group.name}
-    else
-      notify.error _("Empty request received to uninstall Packages or Package Groups for System Group '%s'.") %
-                       @group['name']
-      render :text => ''
-      return
-    end
-
-    render :partial => 'katello/system_groups/packages/items',
-           :locals => { :editable => @group.systems_editable?, :group_id => @group.id, :job => job,
-                        :include_tr_shading => false }
-
-  rescue Errors::SystemGroupEmptyException => e
-    if !params[:packages].blank?
-      notify.error _("Uninstall of Packages '%{packages}' scheduled for System Group '%{name}' failed.  Reason: %{message}") %
-        {:packages => params[:packages], :name => @group.name, :message => e.message}
-    elsif !params[:groups].blank?
-      notify.error _("Uninstall of Package Groups '%{groups}' scheduled for System Group '%{name}' failed.  Reason: %{message}") %
-        {:groups => params[:groups], :name => @group.name, :message => e.message}
-    end
-    render :text => ''
-  end
-
-  # TODO: break up this method
-  # rubocop:disable MethodLength
-  def update
-    if !params[:groups].blank?
-      # user entered one or more package group names (as comma-separated list) in the content box
-      groups = params[:groups].split(/ *, */)
-      job = @group.update_package_groups groups
-      notify.success _("Update of Package Groups '%{groups}' scheduled for System Group '%{name}'.") %
-        {:groups => groups.join(','), :name => @group.name}
-
-    elsif params.key?(:packages)
-      if !params[:packages].empty?
-        # user entered one or more package names (as comma-separated list) in the content box
-        packages = Util::Package.validate_package_list_format(params[:packages])
-
-        if packages
-          job = @group.update_packages packages
-          notify.success _("Update of Packages '%{packages}' scheduled for System Group '%{name}'.") %
-                             {:packages => params[:packages], :name => @group.name}
-        else
-          notify.error _("One or more errors found in Package names '%s'.") % params[:packages]
-          render :text => ''
-          return
-        end
-
-      else
-        # user didn't enter any packages... instead, they requested 'Update All'
-        job = @group.update_packages([])
-        notify.success _("Update of All Packages scheduled for System Group '%{name}'.") % {:name => @group.name}
-      end
-
-    else
-      notify.error _("Invalid request received to update Packages or Package Groups for System Group '%s'.") %
-                       @group['name']
-      render :text => ''
-      return
-    end
-
-    render :partial => 'katello/system_groups/packages/items',
-           :locals  => { :editable           => @group.systems_editable?,
-                         :group_id           => @group.id,
-                         :job                => job,
-                         :include_tr_shading => false }
-
-  rescue Errors::SystemGroupEmptyException => e
-    if !params[:packages].blank?
-      notify.error _("Update of Packages '%{packages}' scheduled for System Group '%{group}' failed.  Reason: %{message}") %
-        {:packages => params[:packages], :group => @group.name, :message => e.message}
-    elsif !params[:groups].blank?
-      notify.error _("Update of Package Groups '%{groups}' scheduled for System Group '%{name}' failed.  Reason: %{message}") %
-        {:groups => params[:groups], :name => @group.name, :message => e.message}
-    end
-    render :text => ''
-  end
-
-  def package_status
-    # retrieve the status for the actions initiated by the client
-    response = []
-    jobs = @group.refreshed_jobs.where('jobs.id' => params[:id])
-    jobs.each do |job|
-      status_html = render_to_string(:template => 'katello/system_groups/packages/_status', :layout => false,
-                                     :locals => {:group_id => @group.id, :id => job.id, :state => job.state,
-                                                 :status_message => job.status_message})
-
-      response << {:id => job.id, :status_html => status_html}
-    end
-
-    render :json => response
-  end
-
-  private
-
-  def find_group
-    @group = SystemGroup.find(params[:system_group_id])
-  end
-end
-end
diff --git a/app/controllers/katello/system_groups_controller.rb b/app/controllers/katello/system_groups_controller.rb
index 9bbc59ee2f2..a720704abdf 100644
--- a/app/controllers/katello/system_groups_controller.rb
+++ b/app/controllers/katello/system_groups_controller.rb
@@ -13,281 +13,27 @@
 module Katello
 class SystemGroupsController < Katello::ApplicationController
 
-  before_filter :panel_options, :only => [:index, :items, :create, :copy]
-  before_filter :find_group, :only => [:edit, :update, :destroy, :destroy_systems, :systems,
-                                       :show, :add_systems, :remove_systems, :edit_systems,
-                                       :update_systems, :copy]
-
   before_filter :authorize
+
   def rules
     any_readable = lambda {current_organization && SystemGroup.any_readable?(current_organization)}
-    read_perm = lambda {@group.readable?}
-    edit_perm = lambda {@group.editable?}
-    create_perm = lambda {SystemGroup.creatable?(current_organization)}
-    destroy_perm = lambda {@group.deletable?}
-    destroy_systems_perm = lambda {@group.systems_deletable?}
-    edit_systems_perm = lambda {@group.systems_editable?}
     {
         :index => any_readable,
         :all => any_readable,
-        :items => any_readable,
-        :new => create_perm,
-        :create => create_perm,
-        :copy => create_perm,
-        :edit => read_perm,
-        :systems => read_perm,
-        :update => edit_perm,
-        :destroy => destroy_perm,
-        :destroy_systems => destroy_systems_perm,
-        :show => read_perm,
-        :auto_complete => any_readable,
-        :add_systems => edit_perm,
-        :remove_systems => edit_perm,
-        :edit_systems => edit_systems_perm,
-        :update_systems => edit_systems_perm,
-        :validate_name => any_readable
-    }
-  end
-
-  def param_rules
-    {
-       :create => {:system_group => [:name, :description, :max_systems]},
-       :update => {:system_group => [:name, :description, :max_systems]},
-       :add_systems => [:system_ids, :id],
-       :remove_systems => [:system_ids, :id],
-       :update_systems => {:system_group => [:environment_id, :content_view_id]}
     }
   end
 
-  def section_id
-    'systems'
-  end
-
   def index
-    if current_user.legacy_mode
-      render :index
-    else
-      render 'bastion/layouts/application', :layout => false
-    end
+    render 'bastion/layouts/application', :layout => false
   end
 
   def all
     redirect_to action: 'index', :anchor => '/system-groups'
   end
 
-  def new
-    @group = SystemGroup.new
-    render :partial => 'new'
-  end
-
-  def create
-    @group = SystemGroup.create!(params[:system_group].merge({:organization_id => current_organization.id}))
-    notify.success _("System Group %s created successfully.") % @group.name
-    if !search_validate(SystemGroup, @group.id, params[:search])
-      notify.message _("'%s' did not meet the current search criteria and is not being shown.") % @group.name
-      render :json => { :no_match => true }
-    else
-      respond_to do |format|
-        format.html do
-          render :partial => "katello/system_groups/list_group",
-                 :locals => {:item => @group, :accessor => "id", :name => controller_display_name}
-        end
-        format.json {render :json => @group}
-      end
-    end
-  end
-
-  def copy
-    new_group = SystemGroup.new
-    new_group.name = params[:name]
-    new_group.description = params[:description]
-    new_group.organization = @group.organization
-    new_group.max_systems = @group.max_systems
-    new_group.save!
-
-    new_group.systems = @group.systems
-    new_group.save!
-
-    notify.success _("System Group %{new_group} created successfully as a copy of system group %{group}.") % {:new_group => new_group.name, :group => @group.name}
-
-    render :partial => "katello/system_groups/list_group",
-           :locals => { :item => new_group, :accessor => "id", :name => controller_display_name }
-  end
-
-  def edit
-    render :partial => "edit", :locals => {:filter => @group, :name => controller_display_name,
-                                           :editable => @group.editable?
-                                          }
-  end
-
-  def show
-    render :partial => "katello/system_groups/list_group",
-           :locals => { :item => @group, :accessor => "id", :name => controller_display_name }
-  end
-
-  def update
-    options = params[:system_group]
-    to_ret = ""
-    if options[:name]
-      @group.name = options[:name]
-      to_ret =  @group.name
-    elsif options[:description]
-      @group.description = options[:description]
-      to_ret = @group.description
-    elsif options[:max_systems]
-      @group.max_systems = options[:max_systems]
-      to_ret = @group.max_systems
-    end
-
-    @group.save!
-    notify.success _("System Group %s has been updated.") % @group.name
-
-    if !search_validate(SystemGroup, @group.id, params[:search])
-      notify.message _("'%s' no longer matches the current search criteria.") % @group["name"],
-                     :asynchronous => false
-    end
-
-    render :text => to_ret
-  end
-
-  def destroy
-    @group.destroy
-    notify.success _("System Group %s deleted.") % @group.name
-    render :partial => "katello/common/list_remove",
-           :locals => { :id => params[:id], :name => controller_display_name }
-  end
-
-  def destroy_systems
-    # this will destroy both the systems contained within the group as well as the group itself
-    system_names = []
-    @group.systems.each do |system|
-      system_names.push(system.name)
-      system.destroy
-    end
-    @group.destroy
-
-    notify.success _("Deleted System Group %{group} and it's %{count} systems.") % {:group => @group.name, :count => system_names.length.to_s},
-                   :details => system_names.join("\n")
-
-    render :js => "katello/common/list_remove",
-           :locals => { :id => params[:id], :name => controller_display_name }
-  end
-
-  def items
-    ids = SystemGroup.readable(current_organization).collect{|s| s.id}
-
-    render_panel_direct(SystemGroup, @panel_options, params[:search], params[:offset], [:name_sort, :asc],
-      {:default_field => :name, :load => true, :filter => [{:id => ids},
-                                                           {:organization_id => [current_organization.id]}]})
-  end
-
-  def panel_options
-    @panel_options = {
-        :title => _('System Groups'),
-        :col => ['name'],
-        :titles => [_('Name')],
-        :create => _('System Group'),
-        :name => controller_display_name,
-        :ajax_scroll => items_system_groups_path,
-        :enable_create => SystemGroup.creatable?(current_organization),
-        :initial_action => :systems,
-        :list_partial => 'katello/system_groups/list_groups',
-        :ajax_load => true,
-        :search_class => SystemGroup
-    }
-  end
-
-  def systems
-    @system_joins = @group.system_system_groups.sort_by{|a| a.system.name}
-    render :partial => "systems",
-           :locals => {:filter => @group, :name => controller_display_name, :editable => @group.editable?,
-                       :systems_deletable => @group.systems_deletable?}
-  end
-
-  def add_systems
-    ids = params[:system_ids].collect{|s| s.to_i} - @group.system_ids #ignore dups
-    systems = System.readable(current_organization).where(:id => ids)
-    @group.system_ids = (@group.system_ids + systems.collect{|s| s.id}).uniq
-    @group.save!
-    system_joins = @group.system_system_groups.where(:system_id => ids)
-
-    notify.success _("Successfully added system[s] to group '%s'.") % @group.name
-
-    render :partial => 'system_item', :collection => system_joins, :as => :system,
-           :locals => {:editable => @group.editable?}
-  end
-
-  def remove_systems
-    systems = System.readable(current_organization).where(:id => params[:system_ids]).collect{|s| s.id}
-    @group.system_ids = (@group.system_ids - systems).uniq
-    @group.save!
-
-    notify.success _("Successfully removed system[s] from group '%s'.") % @group.name
-
-    render :text => ''
-  end
-
-  def edit_systems
-    accessible_envs  = current_organization.environments
-    setup_environment_selector(current_organization, accessible_envs)
-    @organization = current_organization
-    @environment = first_env_in_path(accessible_envs, true)
-
-    render :partial => "edit_systems",
-           :locals => {:filter => @group, :accessible_envs => accessible_envs}
-  end
-
-  def update_systems
-    if params[:systems].blank?
-      systems = @group.systems
-      notice_text = _("Successfully updated environment and content view for all %{count} systems in group %{group}") %
-          {:group => @group.name, :count => systems.length.to_s}
-
-    else
-      systems = @group.systems.where(:id => params[:systems].keys)
-      notice_text = _("Successfully updated environment and content view for %{count} selected systems in group %{group}") %
-          {:group => @group.name, :count => systems.length.to_s}
-    end
-
-    unless params[:update_fields].blank?
-      systems.each do|system|
-        system.update_attributes!(params[:update_fields])
-      end
-    end
-
-    notify.success notice_text, :details => systems.map(&:name).join("\n")
-
-    render :text => ''
-  end
-
-  def auto_complete
-    query = "name_autocomplete:#{params[:term]}"
-    org = current_organization
-
-    groups = SystemGroup.search do
-      query do
-        string query
-      end
-      filter :term, {:organization_id => org.id}
-      filter :terms, {:id => SystemGroup.editable(org).collect{|g| g.id}}
-    end
-    render :json => groups.map{|s| {:label => s.name, :value => s.name, :id => s.id}}
-  rescue Tire::Search::SearchRequestFailed
-    render :json => Util::Support.array_with_total
-  end
-
   def controller_display_name
     return 'system_group'
   end
 
-  def validate_name
-    name = params[:term]
-    render :json => SystemGroup.search("name:#{name}").count
-  end
-
-  def find_group
-    @group = SystemGroup.find(params[:id])
-  end
-
 end
 end
diff --git a/app/controllers/katello/system_packages_controller.rb b/app/controllers/katello/system_packages_controller.rb
deleted file mode 100644
index b0788196f2c..00000000000
--- a/app/controllers/katello/system_packages_controller.rb
+++ /dev/null
@@ -1,201 +0,0 @@
-#
-# Copyright 2013 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
-module Katello
-class SystemPackagesController < Katello::ApplicationController
-
-  before_filter :find_system
-  before_filter :authorize
-
-  def section_id
-    'systems'
-  end
-
-  def rules
-    edit_system = lambda{System.find(params[:system_id]).editable?}
-    read_system = lambda{System.find(params[:system_id]).readable?}
-
-    {
-      :packages => read_system,
-      :more_packages => read_system,
-      :add => edit_system,
-      :remove => edit_system,
-      :update => edit_system,
-      :package_status => edit_system
-    }
-  end
-
-  def add
-    if !params[:packages].blank?
-      # user entered one or more package names (as comma-separated list) in the content box
-      packages = Util::Package.validate_package_list_format(params[:packages])
-
-      if packages
-        task = @system.install_packages packages
-        notify.success _("Install of Packages '%{p}' scheduled for System '%{s}'.") %
-                           { :s => @system['name'], :p => params[:packages] }
-      else
-        notify.error _("One or more errors found in Package names '%s'.") % params[:packages]
-        render :text => ''
-        return
-      end
-
-    elsif !params[:groups].blank?
-      # user entered one or more package group names (as comma-separated list) in the content box
-      groups = params[:groups].split(/ *, */)
-      task = @system.install_package_groups groups
-      notify.success _("Install of Package Groups '%{g}' scheduled for System '%{s}'.") %
-                         { :s => @system['name'], :g => params[:groups] }
-    else
-      notify.error _("Empty request received to install Packages or Package Groups for System '%s'.") %
-                       @system['name']
-      render :text => ''
-      return
-    end
-
-    render :text => task.id
-  end
-
-  def remove
-    if !params[:package].nil?
-      # user selected one or more packages from the list of installed packages
-      packages = params[:package].keys
-      task = @system.uninstall_packages packages
-      notify.success _("Uninstall of Packages '%{p}' scheduled for System '%{s}'.") %
-                         { :s => @system['name'], :p => packages.join(',') }
-
-    elsif !params[:packages].blank?
-      # user entered one or more package names (as comma-separated list) in the content box
-      packages = Util::Package.validate_package_list_format(params[:packages])
-
-      if packages
-        task = @system.uninstall_packages packages
-        notify.success _("Uninstall of Packages '%{p}' scheduled for System '%{s}'.") %
-                           { :s => @system['name'], :p => params[:packages] }
-      else
-        notify.error _("One or more errors found in Package names '%s'.") % params[:packages]
-        render :text => ''
-        return
-      end
-
-    elsif !params[:groups].blank?
-      # user entered one or more package group names (as comma-separated list) in the content box
-      groups = params[:groups].split(/ *, */)
-      task = @system.uninstall_package_groups groups
-      notify.success _("Uninstall of Package Groups '%{p}' scheduled for System '%{s}'.") %
-                         { :s => @system['name'], :p => groups.join(',') }
-    else
-      notify.error _("Empty request received to uninstall Packages or Package Groups for System '%s'.") %
-                       @system['name']
-      render :text => ''
-      return
-    end
-
-    render :text => task.id
-  end
-
-  def update
-    packages = nil
-    if !params[:package].nil?
-      # user selected one or more packages from the list of installed packages
-      packages = params[:package].keys
-    end
-
-    task = @system.update_packages packages
-
-    if packages.nil?
-      notify.success _("Update of all packages scheduled for System '%s'.") % @system['name']
-    else
-      notify.success _("Update of Packages '%{p}' scheduled for System '%{s}'.") %
-                         { :s => @system['name'], :p => params[:package] }
-    end
-
-    render :text => task.id
-  end
-
-  def packages
-    if @system.class == Hypervisor
-      render :partial => "systems/hypervisor",
-             :locals => {:system => @system,
-                         :message => _("Hypervisors do not have packages")}
-      return
-    end
-
-    offset = current_user.page_size
-    packages = @system.simple_packages.sort {|a, b| a.nvrea.downcase <=> b.nvrea.downcase}
-    total_packages = packages.length
-    if total_packages > 0
-      if params.key? :pkg_order
-        if params[:pkg_order].downcase == "desc"
-          packages.reverse!
-        end
-      end
-    else
-      packages = []
-    end
-
-    package_tasks = @system.tasks.where(:task_type => [:package_install, :package_update, :package_remove],
-                                        :state => [:waiting, :running])
-    group_tasks = @system.tasks.where(:task_type => [:package_group_install, :package_group_remove],
-                                      :state => [:waiting, :running])
-
-    render :partial => "packages", :locals => {:system => @system, :packages => packages,
-                                               :total_packages => total_packages,
-                                               :package_tasks => package_tasks,
-                                               :group_tasks => group_tasks,
-                                               :offset => offset, :editable => @system.editable?}
-  end
-
-  def more_packages
-    packages = @system.simple_packages.sort {|a, b| a.nvrea.downcase <=> b.nvrea.downcase}
-
-    if params.key? :pkg_order
-      if params[:pkg_order].downcase == "desc"
-        packages.reverse!
-      end
-    end
-
-    render :partial => "package_items", :locals => {:packages => packages, :package_tasks => nil,
-                                                    :group_tasks => nil, :offset => 0,
-                                                    :editable => @system.editable?}
-  end
-
-  def package_status
-    # retrieve the status for the package actions initiated by the client
-    statuses = @system.tasks.where(:id => params[:id],
-                                   :task_type => [:package_install, :package_update, :package_remove,
-                                                  :package_group_install, :package_group_remove])
-    render :json => statuses
-  end
-
-  private
-
-  include SortColumnList
-
-  def find_system
-    @system = System.find(params[:system_id])
-  end
-
-  def controller_display_name
-    return 'system'
-  end
-
-  def sort_order_limit(systems)
-    sort_columns(COLUMNS, systems) if params[:order]
-    offset = params[:offset].to_i if params[:offset]
-    offset ||= 0
-    last = offset + current_user.page_size
-    last = systems.length if last > systems.length
-    systems[offset...last]
-  end
-end
-end
diff --git a/app/controllers/katello/systems_controller.rb b/app/controllers/katello/systems_controller.rb
index bf100cfe47f..c3351071a62 100644
--- a/app/controllers/katello/systems_controller.rb
+++ b/app/controllers/katello/systems_controller.rb
@@ -14,833 +14,27 @@
 # rubocop:disable SymbolName
 module Katello
 class SystemsController < Katello::ApplicationController
-  include SystemsHelper
-  include ConsumersControllerLogic
-
-  before_filter :find_system, :except => [:index, :all, :items, :environments, :new, :create, :bulk_destroy,
-                                          :bulk_content_install, :bulk_content_update, :bulk_content_remove,
-                                          :bulk_errata_install, :bulk_add_system_group, :bulk_remove_system_group,
-                                          :auto_complete]
-  before_filter :find_systems, :only => [:bulk_destroy, :bulk_content_install, :bulk_content_update, :bulk_content_remove,
-                                         :bulk_errata_install, :bulk_add_system_group, :bulk_remove_system_group]
-
-  before_filter :find_environment, :only => [:environments, :new]
-  before_filter :find_environment_in_system, :only => [:create, :update]
   before_filter :authorize
 
-  before_filter :setup_options, :only => [:index, :all, :items, :create, :environments]
-
-  # two pane columns and mapping for sortable fields
-  COLUMNS = {'name' => 'name_sort', 'lastCheckin' => 'lastCheckin'}
-
-  # TODO: break up method
-  # rubocop:disable MethodLength
   def rules
-    read_system = lambda{System.find(params[:id]).readable?}
-    env_system = lambda{@environment && @environment.systems_readable?}
     any_readable = lambda{current_organization && System.any_readable?(current_organization)}
-    delete_systems = lambda{@system.deletable?}
-    bulk_delete_systems = lambda{@systems.collect{|s| false unless s.deletable?}.compact.empty?}
-    bulk_edit_systems = lambda{@systems.collect{|s| false unless s.editable?}.compact.empty?}
-    register_system = lambda do
-      if current_organization
-        if params.key?(:system) && !params[:system][:content_view_id].blank?
-          content_view = ContentView.readable(current_organization).
-            find_by_id(params[:system][:content_view_id])
-          System.registerable?(@environment, current_organization, content_view) if content_view
-        else
-          System.registerable?(@environment, current_organization)
-        end
-      end
-    end
-
-    items_test = lambda do
-      if params[:env_id]
-        @environment = KTEnvironment.find(params[:env_id])
-        @environment && @environment.systems_readable?
-      else
-        current_organization && System.any_readable?(current_organization)
-      end
-    end
-
-    edit_system = lambda do
-      subscribable = true
-      if params.key?(:system) && !params[:system][:content_view_id].blank?
-        content_view = ContentView.readable(current_organization).
-          find_by_id(params[:system][:content_view_id])
-        subscribable = content_view ? content_view.subscribable? : false
-      end
-      subscribable && System.find(params[:id]).editable?
-    end
-
     {
       :index => any_readable,
       :all => any_readable,
-      :create => register_system,
-      :new => register_system,
-      :items => items_test,
-      :environments => env_system,
-      :subscriptions => read_system,
-      :update_subscriptions => edit_system,
-      :products => read_system,
-      :more_products => read_system,
-      :update => edit_system,
-      :edit => read_system,
-      :show => read_system,
-      :facts => read_system,
-      :auto_complete => any_readable,
-      :destroy => delete_systems,
-      :bulk_destroy => bulk_delete_systems,
-      :bulk_add_system_group => bulk_edit_systems,
-      :bulk_remove_system_group => bulk_edit_systems,
-      :bulk_content_install => bulk_edit_systems,
-      :bulk_content_update => bulk_edit_systems,
-      :bulk_content_remove => bulk_edit_systems,
-      :bulk_errata_install => bulk_edit_systems,
-      :system_groups => read_system,
-      :add_system_groups => edit_system,
-      :remove_system_groups => edit_system,
-      :custom_info => read_system,
-      :releases => read_system
-    }
-  end
-
-  def param_rules
-    update_check = lambda do
-      if params[:system]
-        sys_rules = {:system => [:name, :description, :location, :releaseVer, :serviceLevel, :environment_id, :content_view_id]}
-        check_hash_params(sys_rules, params)
-      else
-        check_array_params([:id], params)
-      end
-    end
-    {:create => {:arch => [:arch_id],
-                 :system => [:sockets, :name, :environment_id, :content_view_id, :memory],
-                 :system_type => [:virtualized]
-                },
-     :update => update_check
     }
   end
 
-  def new
-    install_cert_command = "rpm -Uvh http://#{request.host}/pub/candlepin-cert-consumer-latest.noarch.rpm"
-    register_command = "subscription-manager register --org=\"#{@environment.organization.name}\""
-
-    render :partial => "new",
-           :locals => {
-        :install_cert_command => install_cert_command,
-        :register_command => register_command
-      }
-  end
-
   def index
-    @system_groups = SystemGroup.where(:organization_id => current_organization).order(:name)
-
-    if current_user.legacy_mode
-      @auto_attach_task = TaskStatus.find_by_id(current_organization.owner_auto_attach_all_systems_task_id)
-      render :index
-    else
-      render 'bastion/layouts/application', :layout => false
-    end
+    render 'bastion/layouts/application', :layout => false
   end
 
   def all
-    redirect_to action: 'index', :anchor => '/systems'
-  end
-
-  def environments
-    accesible_envs = KTEnvironment.systems_readable(current_organization)
-
-    @system_groups = SystemGroup.where(:organization_id => current_organization).order(:name)
-
-    @systems = []
-    setup_environment_selector(current_organization, accesible_envs)
-    if @environment
-      # add the environment id as a search filter.. this will be passed to the app by search as part of
-      # the auto_complete_search requests
-      @panel_options[:search_env] = @environment.id
-    end
-
-    render :index, :locals => {:envsys => true, :accessible_envs => accesible_envs}
-  end
-
-  def items
-    order = split_order(params[:order])
-    search = params[:search]
-    if params[:env_id]
-      find_environment
-      filters = {:environment_id => [params[:env_id]]}
-    else
-      filters = readable_filters
-    end
-    render_panel_direct(System, @panel_options, search, params[:offset], order,
-                        {:default_field => :name, :filter => filters, :load => true})
-
-  end
-
-  def auto_complete
-    query = "name_autocomplete:#{params[:term]}"
-    filters = readable_filters
-    systems = System.search do
-      query do
-        string query
-      end
-      filter :terms, filters
-    end
-
-    render :json => (systems.map do |s|
-      label = _("%{name} (Registered: %{time})") % {:name => s.name, :time => convert_time(format_time(Time.parse(s.created_at)))}
-      {:label => label, :value => s.name, :id => s.id}
-    end)
-  rescue Tire::Search::SearchRequestFailed
-    render :json => Util::Support.array_with_total
-  end
-
-  def split_order(order)
-    if order
-      order.split("|")
-    else
-      [:name_sort, "ASC"]
-    end
-
-  end
-
-  def subscriptions
-    consumed = consumed_subscriptions(@system)
-    available = available_subscriptions(@system.filtered_pools(
-      current_user.subscriptions_match_system_preference,
-      current_user.subscriptions_match_installed_preference,
-      current_user.subscriptions_no_overlap_preference))
-
-    # Set up the subscription filters based upon the user prefs
-    options = [
-        (current_user.subscriptions_match_system_preference ? "selected='selected'" : ''), _("Match System"),
-        (current_user.subscriptions_match_installed_preference ? "selected='selected'" : ''), _("Match Installed Software"),
-        (current_user.subscriptions_no_overlap_preference ? "selected='selected'" : ''), _("No Overlap with Current")
-    ]
-    subscription_filters = format(<<-EOS, *options)
-          <option value='subscriptions_match_system' %s>%s</option>
-          <option value='subscriptions_match_installed' %s>%s</option>
-          <option value='subscriptions_no_overlap' %s>%s</option>
-    EOS
-
-    @organization = current_organization
-    render :partial => "subscriptions", :locals => {:system => @system, :avail_subs => available,
-                                                    :consumed_entitlements => consumed,
-                                                    :editable => @system.editable?, :subscription_filters => subscription_filters}
-  end
-
-  def update_subscriptions
-    if params.key? :subscription
-      params[:subscription].keys.each do |pool|
-        @system.subscribe pool, params[:spinner][pool] if params[:subscribe_action].downcase == "subscribe"
-        @system.unsubscribe pool if params[:subscribe_action].downcase == "unsubscribe"
-      end
-    end
-    consumed_entitlements = @system.consumed_entitlements
-    avail_pools = @system.available_pools_full
-    render :partial => "subs_update",
-           :locals => {:system => @system,
-                       :avail_subs => avail_pools,
-                       :consumed_subs => consumed_entitlements,
-                       :editable => @system.editable?}
-    notify.success _("System subscriptions updated.")
-  rescue RestClient::Exception => e
-    notify.error(JSON.parse(e.response)["displayMessage"])
-    render :text => "", :status => 500
-  end
-
-  def products
-    if @system.class == Hypervisor
-      render :partial => "hypervisor",
-             :locals => {:system => @system,
-                         :message => _("Hypervisors do not have software products")}
-      return
-    end
-
-    @products_count = @system.installedProducts.size
-    @products, @offset = first_objects @system.installedProducts.sort {|a, b| a['productName'].downcase <=> b['productName'].downcase}
-    render :partial => "products",
-           :locals => {:system => @system, :products => @products, :offset => @offset, :products_count => @products_count}
-  end
-
-  def more_products
-    # offset is computed in javascript but this one is used in tests
-    @products, @offset = more_objects @system.installedProducts.sort {|a, b| a['productName'].downcase <=> b['productName'].downcase}
-    render :partial => "more_products", :locals => {:system => @system, :products => @products}
-  end
-
-  def releases
-    releases = {"" => _("System Default")}
-    @system.available_releases.each do |release|
-      releases[release] = release
-    end
-    render :json => releases
-  end
-
-  def edit
-    if Katello.config.katello?
-      begin
-        releases = @system.available_releases
-      rescue => e
-        releases_error = e.to_s
-        Rails.logger.error e.to_s
-      end
-      releases ||= []
-      releases_error ||= nil
-    else
-      releases = nil
-      releases_error = nil
-    end
-
-    # Stuff into var for use in spec tests
-    @locals_hash = {:system => @system, :editable => @system.editable?,
-                    :releases => releases, :releases_error => releases_error, :name => controller_display_name,
-                    :environments => environment_paths(library_path_element("systems_readable?"),
-                                                       environment_path_element("systems_readable?"))}
-    render :partial => "edit", :locals => @locals_hash
-  end
-
-  # TODO: break up method
-  # rubocop:disable MethodLength
-  def update
-    # The 'autoheal' flag is not an ActiveRecord attribute so update it explicitly if present
-    # The 'serviceLevel' comes in as a string 0/1 + level (eg. 0STANDARD = auto off, STANDARD))
-    if params[:system] && params[:system][:serviceLevel]
-      val = params[:system][:serviceLevel]
-      if val == '0'
-        params[:system][:serviceLevel] = ''
-        @system.autoheal = false
-      elsif val == '1'
-        params[:system][:serviceLevel] = ''
-        @system.autoheal = true
-      else
-        if val.start_with? '1'
-          @system.autoheal = true
-        else
-          @system.autoheal = false
-        end
-        params[:system][:serviceLevel] = val[1..-1]
-      end
-    end
-
-    @system.update_attributes!(params[:system])
-    notify.success _("System '%s' was updated.") % @system["name"]
-
-    if !search_validate(System, @system.id, params[:search])
-      notify.message _("'%s' no longer matches the current search criteria.") % @system["name"],
-                     :asynchronous => false
-    end
-
-    respond_to do |format|
-      format.html do
-        # Use the systems_helper method when returning service level so the UI reflects proper text
-        if params[:system] && params[:system][:serviceLevel]
-          render :text => system_servicelevel(@system)
-        else
-          render :text => (params[:system] ? params[:system].first[1] : "")
-        end
-      end
-      format.js
-    end
-  end
-
-  def custom_info
-    render :partial => "edit_custom_info"
-  end
-
-  # TODO: break up method
-  # rubocop:disable MethodLength
-  def show
-    system = System.find(params[:id])
-
-    if current_user.legacy_mode
-      begin
-        releases = @system.available_releases
-      rescue => e
-        releases_error = e.to_s
-        Rails.logger.error e.to_s
-      end
-      releases ||= []
-      releases_error ||= nil
-
-      # Stuff into var for use in spec tests
-      @locals_hash = {:system => @system, :editable => @system.editable?,
-                      :releases => releases, :releases_error => releases_error, :name => controller_display_name,
-                      :environments => environment_paths(library_path_element("systems_readable?"),
-                                                         environment_path_element("systems_readable?"))}
-
-      if request.xhr?
-        render :show_nutupane, :layout => false, :locals => @locals_hash
-      else
-        render :show_nutupane, :locals => @locals_hash
-      end
-    else
-      render :partial => "systems/list_system_show", :locals => {:item => system, :accessor => "id", :columns => COLUMNS.keys, :noblock => 1}
-    end
-  end
-
-  def section_id
-    'systems'
-  end
-
-  def facts
-    render :partial => 'facts'
-  end
-
-  def destroy
-    id = params[:id]
-    system = find_system
-    system.destroy
-    if system.destroyed?
-      notify.success _("%s Removed Successfully") % system.name
-      #render and do the removal in one swoop!
-      render :partial => "common/list_remove", :locals => {:id => id, :name => controller_display_name}
-      return
-    end
-    notify.invalid_record system
-    render :text => @system.errors, :status => :ok
-  end
-
-  def bulk_destroy
-    @systems.each { |sys| sys.destroy }
-    notify.success _("%s Systems Removed Successfully") % @systems.length
-    render :text => ""
-  end
-
-  # TODO: break up method
-  # rubocop:disable MethodLength
-  def bulk_add_system_group
-    successful_systems = []
-    failed_systems = []
-
-    unless params[:group_ids].blank?
-      @system_groups = SystemGroup.where(:id => params[:group_ids])
-
-      # perform some pre-validation of the request
-      # e.g. are any of the groups not editable or will their membership be exceeded by the request?
-      invalid_perms = []
-      max_systems_exceeded = []
-      @system_groups.each do |system_group|
-        if !system_group.editable?
-          invalid_perms.push(system_group.name)
-        elsif (system_group.max_systems != SystemGroup::UNLIMITED_SYSTEMS) && ((system_group.systems.length + @systems.length) > system_group.max_systems)
-          max_systems_exceeded.push(system_group.name)
-        end
-      end
-      if !invalid_perms.empty?
-        return render_bad_parameters _("System Group membership modification not allowed for group(s): %s") % invalid_perms.join(', ')
-      elsif !max_systems_exceeded.empty?
-        return render_bad_parameters _("System Group maximum number of systems exceeded for group(s): %s") % max_systems_exceeded.join(', ')
-      end
-
-      @systems.each do |system|
-        begin
-          system.system_group_ids = (system.system_group_ids + @system_groups.collect{|g| g.id}).uniq
-          system.save!
-          successful_systems.push(system.name)
-        rescue
-          failed_systems.push(system.name)
-        end
-      end
-      action = _("Systems Bulk Action: Add to system group(s): %s") % @system_groups.collect{|g| g.name}.join(', ')
-      notify_bulk_action(action, successful_systems, failed_systems)
-    end
-
-    render :nothing => true
-  end
-
-  # TODO: break up method
-  # rubocop:disable MethodLength
-  def bulk_remove_system_group
-    successful_systems = []
-    failed_systems = []
-    groups_info = {} # hash to store system group id to name mapping
-    systems_summary = {} # hash to store system to system group mapping, for groups removed from the system
-
-    unless params[:group_ids].blank?
-      @system_groups = SystemGroup.where(:id => params[:group_ids])
-
-      # does the user have permission to modify the requested system groups?
-      invalid_perms = []
-      @system_groups.each do |system_group|
-        if !system_group.editable?
-          invalid_perms.push(system_group.name)
-        end
-        groups_info[system_group.id] = system_group.name
-      end
-      if !invalid_perms.empty?
-        fail _("System Group membership modification not allowed for group(s): %s") % invalid_perms.join(', ')
-      end
-
-      @systems.each do |system|
-        begin
-          groups_removed = system.system_group_ids & groups_info.keys
-          system.system_group_ids = (system.system_group_ids - groups_info.keys).uniq
-          system.save!
-
-          systems_summary[system] = groups_removed.collect{|g| groups_info[g]}
-          successful_systems.push(system.name)
-        rescue
-          failed_systems.push(system.name)
-        end
-      end
-      action = _("Systems Bulk Action: Remove from system group(s): %s") % @system_groups.collect{|g| g.name}.join(', ')
-
-      details = []
-      systems_summary.each_pair do |system, system_groups|
-        details.push(_("System: %{system_name}, System Groups Removed: %{system_group_names}") %
-                     {:system_name => system.name, :system_group_names => system_groups.join(', ')})
-      end
-
-      notify_bulk_action(action, successful_systems, failed_systems, details.join("\n"))
-    end
-
-    render :nothing => true
-  end
-
-  # TODO: break up method
-  # rubocop:disable MethodLength
-  def bulk_content_install
-    successful_systems = []
-    failed_systems = []
-
-    if params[:packages].blank? && params[:groups].blank?
-      notify.error _("Systems Bulk Action: No package or package group names have been provided.")
-      render :nothing => true
-      return
-    end
-
-    if !params[:packages].blank?
-      @systems.each do |system|
-        begin
-          system.install_packages params[:packages]
-          successful_systems.push(system.name)
-        rescue
-          failed_systems.push(system.name)
-        end
-      end
-      action_text = _("Systems Bulk Action: Schedule install of package(s): %s") % params[:packages].join(', ')
-
-    elsif !params[:groups].blank?
-      @systems.each do |system|
-        begin
-          system.install_package_groups params[:groups]
-          successful_systems.push(system.name)
-        rescue
-          failed_systems.push(system.name)
-        end
-      end
-      action_text = _("Systems Bulk Action: Schedule install of package group(s): %s") % params[:groups].join(', ')
-    end
-
-    notify_bulk_action(action_text, successful_systems, failed_systems)
-    render :nothing => true
-  end
-
-  # TODO: break up method
-  # rubocop:disable MethodLength
-  def bulk_content_update
-    successful_systems = []
-    failed_systems = []
-
-    if !params[:groups].blank?
-      @systems.each do |system|
-        begin
-          system.install_package_groups params[:groups]
-          successful_systems.push(system.name)
-        rescue
-          failed_systems.push(system.name)
-        end
-      end
-      action_text = _("Systems Bulk Action: Schedule update of package group(s): %s") % params[:groups].join(', ')
-    else
-      @systems.each do |system|
-        begin
-          system.update_packages params[:packages]
-          successful_systems.push(system.name)
-        rescue
-          failed_systems.push(system.name)
-        end
-      end
-      if params[:packages].blank?
-        action_text = _("Systems Bulk Action: Schedule update of all packages")
-      else
-        action_text = _("Systems Bulk Action: Schedule update of package(s): %s") % params[:packages].join(', ')
-      end
-    end
-
-    notify_bulk_action(action_text, successful_systems, failed_systems)
-    render :nothing => true
-  end
-
-  # TODO: break up method
-  # rubocop:disable MethodLength
-  def bulk_content_remove
-    successful_systems = []
-    failed_systems = []
-
-    if params[:packages].blank? && params[:groups].blank?
-      notify.error _("Systems Bulk Action: No package or package group names have been provided.")
-      render :nothing => true
-      return
-    end
-
-    if !params[:packages].blank?
-      @systems.each do |system|
-        begin
-          system.uninstall_packages params[:packages]
-          successful_systems.push(system.name)
-        rescue
-          failed_systems.push(system.name)
-        end
-      end
-      action_text = _("Systems Bulk Action: Schedule uninstall of package(s): %s") % params[:packages].join(', ')
-    elsif !params[:groups].blank?
-      @systems.each do |system|
-        begin
-          system.uninstall_package_groups params[:groups]
-          successful_systems.push(system.name)
-        rescue
-          failed_systems.push(system.name)
-        end
-      end
-      action_text = _("Systems Bulk Action: Schedule uninstall of package group(s): %s") % params[:groups].join(', ')
-    end
-
-    notify_bulk_action(action_text, successful_systems, failed_systems)
-    render :nothing => true
-  end
-
-  def bulk_errata_install
-    successful_systems = []
-    failed_systems = []
-
-    if params[:errata].blank?
-      notify.error _("Systems Bulk Action: No errata IDs have been provided.")
-      render :nothing => true
-      return
-    else
-      @systems.each do |system|
-        begin
-          system.install_errata params[:errata]
-          successful_systems.push(system.name)
-        rescue
-          failed_systems.push(system.name)
-        end
-      end
-    end
-
-    action = _("Systems Bulk Action: Schedule install of errata(s): %s") % params[:errata].join(', ')
-    notify_bulk_action(action, successful_systems, failed_systems)
-    render :nothing => true
-  end
-
-  def system_groups
-    # retrieve the available groups that aren't currently assigned to the system and that haven't reached their max
-    # TODO: move the sql to the model
-    @system_groups = SystemGroup.where(:organization_id => current_organization).
-        select("#{SystemGroup.table_name}.id, #{SystemGroup.table_name}.name").
-        joins("LEFT OUTER JOIN #{SystemSystemGroup.table_name} ON #{SystemSystemGorup.table_name}.system_group_id = #{SystemGroup.table_name}.id").
-        group("#{SystemGroup.table_name}.id, #{SystemGroup.table_name}.name, \
-              #{SystemGroup.table_name}.max_systems having count(#{SystemSytemGroup}.system_id) < #{SystemGroup.table_name}.max_systems \
-              or #{SystemGroup.table_name}.max_systems = -1").
-        order(:name) - @system.system_groups
-
-    render :partial => "system_groups", :locals => {:editable => @system.editable?}
-  end
-
-  def add_system_groups
-    if params[:group_ids].nil? || params[:group_ids].blank?
-      notify.error _('One or more system groups must be provided.')
-      render :nothing => true, :status => 500
-    else
-      ids = params[:group_ids].collect{|g| g.to_i} - @system.system_group_ids #ignore dups
-      @system_groups = SystemGroup.where(:id => ids)
-      @system.system_group_ids = (@system.system_group_ids + @system_groups.collect{|g| g.id}).uniq
-      @system.save!
-
-      notify.success _("System '%s' was updated.") % @system["name"]
-      render :partial => 'system_group_items', :locals => {:system_groups => @system_groups}
-    end
-  end
-
-  def remove_system_groups
-    system_groups = SystemGroup.where(:id => params[:group_ids]).collect{|g| g.id}
-    @system.system_group_ids = (@system.system_group_ids - system_groups).uniq
-    @system.save!
-
-    notify.success _("System '%s' was updated.") % @system["name"]
-    render :nothing => true
-  end
-
-  private
-
-  include SortColumnList
-
-  def notify_bulk_action(action, successful_systems, failed_systems, details = nil)
-    # generate a notice for a bulk action
-
-    success_msg = _("Successful for system(s): ")
-    failure_msg = _("Failed for system(s):")
-    newline = '<br />'
-
-    if failed_systems.empty?
-      notify.success(action + newline + success_msg + successful_systems.join(', '), {:details => details})
-    else
-      if successful_systems.empty?
-        notify.error action + newline + failure_msg + failed_systems.join(', ')
-      else
-        notify.error(action + newline + success_msg + successful_systems.join(',') +
-                     newline + failure_msg + failed_systems.join(','),
-                     {:details => details})
-      end
-    end
-  end
-
-  def find_environment
-    if current_organization
-      readable = KTEnvironment.systems_readable(current_organization)
-      @environment = KTEnvironment.find(params[:env_id]) if params[:env_id]
-      @environment ||= first_env_in_path(readable, true)
-      @environment ||=  current_organization.library
-    end
-  end
-
-  def find_environment_in_system
-    if params.key?(:system) && params[:system].key?(:environment_id)
-      @environment = KTEnvironment.systems_readable(current_organization).
-                      where(:id => params[:system][:environment_id]).first
-    end
-  end
-
-  def find_system
-    sys_id = params[:id] || params[:system_id]
-    @system = System.find(sys_id)
-  end
-
-  def find_systems
-    @systems = System.find(params[:ids])
-  end
-
-  def setup_options
-    @panel_options = {
-      :title => _('Systems'),
-      :col => %w(name_sort lastCheckin),
-      :titles => [_("Name"), _("Registered / Last Checked In")],
-      :custom_rows => true,
-      :enable_create => System.registerable?(@environment, current_organization),
-      :create => _("System"),
-      :create_label => _('+ Register System'),
-      :enable_sort => true,
-      :name => controller_display_name,
-      :list_partial => 'systems/list_systems',
-      :ajax_load  => true,
-      :ajax_scroll => items_systems_path,
-      :actions => System.any_deletable?(@environment, current_organization) ? 'actions' : nil,
-      :initial_action => :subscriptions,
-      :search_class => System,
-      :disable_create => current_organization.environments.length == 0 ? _("At least one environment is required to create or register systems in your current organization.") : false
-    }
-  end
-
-  # rubocop:disable SymbolName
-  def sys_consumed_pools
-    consumed_pools = @system.pools.collect do |pool|
-      OpenStruct.new(:poolId => pool["id"],
-                     :poolName => pool["productName"],
-                     :startDate => format_time(Date.parse(pool["startDate"])),
-                     :endDate => format_time(Date.parse(pool["endDate"])),
-                     :consumed => pool["consumed"],
-                     :quantity => pool["quantity"])
-    end
-    consumed_pools.sort! {|a, b| a.poolName <=> b.poolName}
-    consumed_pools
-  end
-
-  # rubocop:disable SymbolName
-  def sys_available_pools
-    avail_pools = @system.available_pools.collect do |pool|
-      OpenStruct.new(:poolId => pool["id"],
-                     :poolName => pool["productName"],
-                     :startDate => format_time(Date.parse(pool["startDate"])),
-                     :endDate => format_time(Date.parse(pool["endDate"])),
-                     :consumed => pool["consumed"],
-                     :quantity => pool["quantity"])
-    end
-    avail_pools.sort! {|a, b| a.poolName <=> b.poolName}
-    avail_pools
+    redirect_to :action => 'index', :anchor => '/systems'
   end
 
   def controller_display_name
     return 'system'
   end
 
-  #array constructing a filter
-  # to filter readable systems that can be
-  # passed to search
-  def readable_filters
-    {:environment_id => KTEnvironment.systems_readable(current_organization).collect{|item| item.id}}
-  end
-
-  def search_filter
-    @filter = {:organization_id => current_organization}
-  end
-
-  def sort_order_limit(systems)
-    sort_columns(COLUMNS, systems) if params[:order]
-    offset = params[:offset].to_i if params[:offset]
-    offset ||= 0
-    last = offset + current_user.page_size
-    last = systems.length if last > systems.length
-    systems[offset...last]
-  end
-
-  def first_objects(objects)
-    offset = current_user.page_size
-    if objects.length > 0
-      if params.key? :order
-        if params[:order].downcase == "desc"
-          objects.reverse!
-        end
-      end
-      objects = objects[0...offset]
-    else
-      objects = []
-    end
-    return objects, offset
-  end
-
-  # TODO: break up this method
-  # rubocop:disable MethodLength
-  def more_objects(objects)
-    #grab the current user setting for page size
-    size = current_user.page_size
-    if objects.length > 0
-      #check for the params offset (start of array chunk)
-      if params.key? :offset
-        offset = params[:offset].to_i
-      else
-        offset = current_user.page_size
-      end
-      if params.key? :order
-        if params[:order].downcase == "desc"
-          #reverse if order is desc
-          objects.reverse!
-        end
-      end
-      if params.key? :reverse
-        next_objects = objects[0...params[:reverse].to_i]
-      else
-        next_objects = objects[offset...(offset + size)]
-      end
-      next_objects ||= [] # fence for case when offset extended beyond range, etc.
-    else
-      next_objects = []
-    end
-
-    return next_objects, (offset + size)
-  end
-
 end
 end
diff --git a/app/controllers/katello/user_sessions_controller.rb b/app/controllers/katello/user_sessions_controller.rb
deleted file mode 100644
index 115d1b072f3..00000000000
--- a/app/controllers/katello/user_sessions_controller.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright 2013 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
-module Katello
-  class UserSessionsController < Katello::ApplicationController
-    before_filter :require_user, :only => [:set_org]
-    skip_before_filter :require_org
-    protect_from_forgery
-
-    skip_before_filter :authorize # ok - need to skip all methods
-    skip_before_filter :check_deleted_org
-
-    def set_org
-      orgs = current_user.allowed_organizations
-      org = Organization.find_by_id(params[:org_id])
-      if org.nil? || !orgs.include?(org)
-        notify.error _("Invalid organization")
-        render :nothing => true
-        return
-      else
-        self.current_organization = org
-      end
-      if self.current_organization == org
-        respond_to do |format|
-          format.html { redirect_to dashboard_index_path }
-          format.js { render :js => "CUI.Login.Actions.redirecter('#{dashboard_index_url}')" }
-        end
-      end
-    end
-
-  end
-end
diff --git a/app/views/katello/environments/_edit.html.haml b/app/views/katello/environments/_edit.html.haml
deleted file mode 100644
index cb69f199879..00000000000
--- a/app/views/katello/environments/_edit.html.haml
+++ /dev/null
@@ -1,40 +0,0 @@
-= javascript 'katello/widgets/jquery.jeditable.helpers', 'katello/environments/environment_edit'
-
-= content_for :title do
-  = _("Environment") + ": " + @environment.name
-
-= content_for :remove_item do
-  -# editable on the org means CRUD on the environments
-  -if editable
-    - if @environment.successor.nil?
-      = link_to _("Remove Environment"), {:controller=>"environments", :action=>"destroy"}, :confirm => _('Are you sure? If any users have this environment set as their default, it will unset it.'), :method => :delete, :class=>"remove_item", :remote=>true, "data-forward"=>edit_organization_path(@organization.label)
-    - else
-      %span{ :class => "remove_item disabled tipsify", :title => _("The selected environment is not the last environment in its promotion path.  Only the last environment can be deleted.") }
-        = _("Remove Environment")
-
-= content_for :subcontent do
-  .clear
-  = form_for @environment, :html => { :name => 'environment_edit' }, :url => {:action => "update",  :organization_id => @organization.label,  :controller => "environments"}, :method => "put", :remote => true do |f|
-
-    %fieldset.clearfix
-      .grid_2.ra
-        %label #{_("Name")}:
-      .grid_5.la{'name' => 'kt_environment[name]', :class=>("editable edit_env_name" if editable), "data-url"=>organization_environment_path(@organization.label, @environment.id),  "data-forward"=>edit_organization_path(@organization.label)}<> #{@environment.name}
-
-    %fieldset
-      .grid_2.ra
-        %label #{_("Label")}:
-      .grid_5.la.multiline #{@environment.label}
-
-    %fieldset.clearfix
-      .grid_2.ra
-        %label #{_("Description")}:
-      .grid_5.la{:style => "word-wrap: break-word;", :class=>("editable edit_textarea" if editable), 'data-maxlength' => default_description_limit, "data-url"=>organization_environment_path(@organization.label, @environment.id), 'name' => 'kt_environment[description]'}<> #{@environment.description}
-
-    %fieldset.clearfix
-      %input{ :type => "hidden", :name => "prior_envs", :value => @env_labels_json }
-      .grid_2.ra
-        %label #{_("Prior Environment")}:
-      .grid_5.la #{@environment.prior.name}
-
-= render :template => "katello/layouts/tupane_layout"
diff --git a/app/views/katello/environments/_new.html.haml b/app/views/katello/environments/_new.html.haml
deleted file mode 100644
index 877348d5a55..00000000000
--- a/app/views/katello/environments/_new.html.haml
+++ /dev/null
@@ -1,26 +0,0 @@
-= javascript 'katello/widgets/subpanel_new'
-
-= content_for :title do
-  #{_("Create Application Life Cycle Management Environment")}
-
-= content_for :navigation do
-  / pretty
-
-= content_for :subcontent do
-  .clear
-    &nbsp;
-  = kt_form_for Katello::KTEnvironment.new, :url => organization_environments_path(@organization.label), :remote=>true, :html => {:id=>"new_subpanel"} do |form|
-
-    = form.text_field :name, :label => _("Name"), :class => :name_input
-
-    = form.field :label, :label => _("Label") do
-      = text_field_tag 'kt_environment[label]', nil, :tabindex => form.tabindex, :size => 30, :class => :label_input, 'data-url' => default_label_organization_environments_path(@organization.label)
-      = image_tag "katello/icons/spinner.gif", :class => 'label_spinner hidden'
-
-    = form.text_area :description, :size => "40x5", :label => _("Description"), :maxlength => default_description_limit
-
-    = form.select :prior, options_for_select(@env_labels, @selected), {}, {:label => _("Prior Environment"), :size=>1, :tabindex => form.tabindex}
-
-    = form.submit _("Create"), :class => 'subpanel_create create_button'
-
-= render :template => "katello/layouts/tupane_layout"
diff --git a/app/views/katello/environments/_products.html.haml b/app/views/katello/environments/_products.html.haml
deleted file mode 100644
index f356250f33a..00000000000
--- a/app/views/katello/environments/_products.html.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-%ul
-  -products.each do |product|
-    %li.la
-      #{product.name}
\ No newline at end of file
diff --git a/app/views/katello/errata/_packages.html.haml b/app/views/katello/errata/_packages.html.haml
deleted file mode 100644
index 1ee13f19c35..00000000000
--- a/app/views/katello/errata/_packages.html.haml
+++ /dev/null
@@ -1,30 +0,0 @@
-= javascript 'widgets/filtertable'
-
-= content_for :title do
-  = @errata.id
-
-= content_for :navigation do
-  = render_subnav_menu(1..2, promotion_errata_navigation)
-
-
-
-= content_for :content do
-  - if @errata.pkglist.length > 0 and @errata.pkglist[0][:packages].length > 0
-    = render :partial => "common/filter_table"
-    %table.filter_table.errata.ajaxScroll
-      %thead
-        %th
-          #{_("Package")}
-      %tbody
-        -@errata.pkglist[0][:packages].each do |pkg|
-          %tr
-            %td
-              - if pkg[:epoch] == "0"
-                = pkg[:name] + "-" + pkg[:version] + '-' + pkg[:release] + "." + pkg[:arch]
-              - else
-                = (pkg[:name] || _("Missing")) + "-" + (pkg[:epoch] || _("Missing")) + ":" + (pkg[:version] || _("Missing")) + '-' + (pkg[:release] || _("Missing")) + "." + (pkg[:arch] || _("Missing"))
-
-  - else
-    %p #{_("There are no packages to display.")}
-
-= render :template => "layouts/tupane_layout"
diff --git a/app/views/katello/errata/_short_details.html.haml b/app/views/katello/errata/_short_details.html.haml
deleted file mode 100644
index 91231c9bf66..00000000000
--- a/app/views/katello/errata/_short_details.html.haml
+++ /dev/null
@@ -1,44 +0,0 @@
-.details_container
-  .item-container
-    %label.fl.ra
-      = _("ID")
-    %p
-      = @errata.id
-  .item-container
-    %label.fl.ra
-      = _("Title: ")
-    %p
-      = @errata.title
-
-  .item-container
-    %label.fl.ra
-      =_("Issued: ")
-    %p
-      = @errata.issued
-
-  - if @errata.references[0]
-    .item-container
-      %label.fl.ra
-        =_("References:")
-      %p
-        = @errata.references[0][:href]
-
-  - if @errata.description
-    .item-container
-      %label.fl.ra
-        = _("Description:")
-      - @errata.description.split("\n\n").each do |p|
-        %p
-          = p
-        %p
-          &nbsp;
-
-  .item-container
-    %label.fl.ra
-      = _("Packages:")
-    %p
-      &nbsp;
-    - if @errata.pkglist[0]
-      - @errata.pkglist[0][:packages].each do |p|
-        %p
-          = p[:filename]
diff --git a/app/views/katello/errata/_show.html.haml b/app/views/katello/errata/_show.html.haml
deleted file mode 100644
index 7e7b28ab7b9..00000000000
--- a/app/views/katello/errata/_show.html.haml
+++ /dev/null
@@ -1,85 +0,0 @@
-= content_for :title do
-  = @errata.id
-
-= content_for :navigation do
-  = render_subnav_menu(1..2, promotion_errata_navigation)
-
-= content_for :content do
-  .clear
-
-  %fieldset
-    .grid_2.ra
-      %label #{_("Advisory")}:
-    .grid_5.la
-      = @errata.errata_id
-
-  %fieldset
-    .grid_2.ra
-      %label #{_("Title")}:
-    .grid_5.la
-      = @errata.title
-
-  %fieldset
-    .grid_2.ra
-      %label #{_("Type")}:
-    .grid_5.la
-      = @errata.type
-
-  %fieldset
-    .grid_2.ra
-      %label #{_("Issued")}:
-    .grid_5.la
-      = @errata.issued
-
-  %fieldset
-    .grid_2.ra
-      %label #{_("Updated")}:
-    .grid_5.la
-      = @errata.updated
-
-  /%fieldset
-  /  .grid_2.ra
-  /    %label #{_("Affected Products")}:
-  /  .grid_5.la
-  /    Red Hat Enterprise Linux 5
-  /    %br
-  /    Red Hat Super Product
-
-  %fieldset
-    .grid_2.ra
-      %label #{_("Associated Bugs")}:
-    .grid_8
-      - if @errata.references.length > 0
-        %table
-          %thead
-            %th
-              #{_("Type")}
-            %th
-              #{_("ID / Link")}
-            %th
-              #{_("Title")}
-          %tbody
-            - @errata.references.each do |reference|
-              - if reference[:type] != "self"
-                %tr
-                  %td
-                    = reference[:type]
-                  %td
-                    - if reference[:href]
-                      %a{:href => reference[:href]}
-                        = reference[:id].nil? ? _("link") : reference[:id]
-                    - else
-                      = reference[:id].nil? ? _("none") : reference[:id]
-                  %td
-                    = reference[:title].nil? ? _('none') : reference[:title]
-      - else
-        #{_("None.")}
-
-  %fieldset
-    .grid_2.suffix_5.la
-      %label #{_("Description")}:
-    .grid_8
-      %pre
-        = @errata.description
-
-= render :template => "layouts/tupane_layout"
diff --git a/app/views/katello/organizations/_default_info.html.haml b/app/views/katello/organizations/_default_info.html.haml
deleted file mode 100644
index 659e083d097..00000000000
--- a/app/views/katello/organizations/_default_info.html.haml
+++ /dev/null
@@ -1,43 +0,0 @@
--# org, informable_type, task_state, and task_uuid from locals
-= javascript 'katello/widgets/jquery.jeditable.helpers'
-
-= javascript do
-  :plain
-    localize({
-      "default_info_apply_success": '#{escape_javascript(_("Successfully synced default info"))}',
-      "default_info_apply_error": '#{escape_javascript(_("An error has occurred while syncing default info. Please contact your administrator"))}',
-      "default_info_create_success": '#{escape_javascript(_("Successfully created default information keyname"))}',
-      "default_info_delete_success": '#{escape_javascript(_("Successfully deleted default information keyname"))}',
-      "default_info_warning": '#{escape_javascript(_("Caution: this action will remove default custom info, even those containing values"))}'
-    });
-
-= content_for :title do
-  = @organization.name
-
-= content_for :navigation do
-  = render_subnav_menu(1..2, organization_navigation)
-
-= content_for :content do
-  #default_info
-    .clear
-      %h5
-        = _('%s Default Custom Info') % informable_type.capitalize
-    .grid_4
-      #apply_default_info_button_container
-        %input.btn.fullwidth#apply_default_info_button{ :value => _("Sync default info to all %s") % informable_type.pluralize, :type => "button", "data-url" => api_organization_apply_default_info_path(org.label, informable_type), "data-method" => "post", :disabled => org.default_info[informable_type].empty?, "data-taskstate" => task_state, "data-taskuuid" => task_uuid }
-      %table#default_info_table.default_info
-        %tbody
-          %tr#new_default_info_row
-            %td
-              %input#new_default_info_keyname{ :placeholder => _("Keyname"), :required => true }
-            %td
-              %input.btn.primary#add_default_info_button{ :value => _("Add"), :type => "submit", "data-url" => api_organization_create_default_info_path(org.label, informable_type), "data-method" => "post", :disabled => true }
-          - org.default_info[informable_type].sort.each do |info|
-            - escaped_info = url_encode(info)
-            %tr.multiline{"data-id" => "default_info_#{escaped_info}" }
-              %td.ra
-                = label :default_info, escaped_info, info
-              %td
-                %input.btn.warning.remove_default_info_button{ :value => _("Remove"), :type => "submit", "data-url" => api_organization_destroy_default_info_path(org.label, informable_type, info), "data-method" => "delete", "data-id" => "default_info_#{escaped_info}" }
-
-= render :template => "katello/layouts/tupane_layout"
diff --git a/app/views/katello/organizations/_download_debug_certificate.html.haml b/app/views/katello/organizations/_download_debug_certificate.html.haml
deleted file mode 100644
index 489d5aa0391..00000000000
--- a/app/views/katello/organizations/_download_debug_certificate.html.haml
+++ /dev/null
@@ -1,14 +0,0 @@
-%br
-%br
-%ul.fl.clear
-  %li#debug_cert.clickable
-    .fl
-      = image_tag('katello/icons/expander-collapsed.png', :alt => _('Expand'))
-    .grid_7.la
-      #{_("Debug Certificate")}:
-    .grid_12.la#show_debug_button
-      %div.helptip-open
-        %p
-          = _('Generating and downloading the debug certificate allows a user to view the repositories in any environment from a browser.')
-      .button#download_debug_cert_key{"data-url"=>download_debug_certificate_organization_path(@organization.id)}
-        = _("Generate and Download")
diff --git a/app/views/katello/organizations/_edit.html.haml b/app/views/katello/organizations/_edit.html.haml
deleted file mode 100644
index 3157b9a18f9..00000000000
--- a/app/views/katello/organizations/_edit.html.haml
+++ /dev/null
@@ -1,87 +0,0 @@
-= javascript do
-  :plain
-    localize({
-        "orgSelectAutoheal": '#{escape_javascript(_("No Service Level Preference"))}'
-    });
-= javascript 'katello/widgets/jquery.jeditable.helpers', 'katello/organizations/organization_edit'
-
-= content_for :title do
-  #{@organization.name}
-
-- if @organization.deletable?
-  = content_for :remove_item do
-    - if current_organization != @organization
-      = link_to _("Remove Organization"), {:controller=>"organizations", :action=>"destroy"}, :confirm => _('Are you sure you want to remove this organization?'), :method => :delete, :class=>"remove_item", :remote=>true
-    - else
-      %span{ :class => "remove_item disabled tipsify", :title => _("The current organization cannot be deleted. Please switch to a different organization before deleting.") }
-        = _("Remove Organization")
-
-= content_for :navigation do
-  = render_subnav_menu(1..2, organization_navigation)
-
-= content_for :content do
-  #organizations
-    %input#panel_element_id{:name => @organization.id, :type => "hidden", :value => "#{name}_#{@organization.label}", "data-ajax_url"=>url_for(:action => 'update')}
-    .full#organization
-      = form_for(@organization, :html => {:multipart => true, :method => :put, :id => 'organization_edit', :remote => true}, :url => organization_path(@organization.id)) do |f|
-
-        %fieldset.fl.clear
-          .grid_3.ra
-            %label #{_("Name")}:
-          .grid_8.la#organization_name{:title=>@organization[:name], 'name' => 'organization[name]', 'data-url' => organization_path(@organization.label),
-                                       :class=>editable_class(editable)} #{@organization[:name]}
-
-        %fieldset.clear
-          .grid_3.ra
-            %label #{_("Label")}:
-          .grid_8.la.multiline #{@organization.label}
-
-        %fieldset.clearfix
-          .grid_3.ra
-            %label #{_("Description")}:
-          .grid_8.la{:style => "word-wrap: break-word;", 'name' => 'organization[description]', :class=>("editable edit_textarea" if editable), 'data-maxlength' => default_description_limit, 'data-url'=>edit_organization_path(@organization.label)} #{@organization[:description]}
-
-        %fieldset
-          .grid_3.ra
-            %label #{_("Default System SLA")}:
-          .grid_8.la
-            .org_servicelevel{'name' => 'organization[service_level]', 'class' => ("editable edit_select_org_servicelevel grid_8" if editable), 'data-url' => edit_organization_path(@organization.label), 'data-options' => organization_servicelevel_edit(@organization)}
-              = organization_servicelevel(@organization)
-
-        - if Katello.config.katello?
-          .grid_7
-            %h5 #{_("Environment Promotion Paths")}:
-
-          - unless @organization.environments.empty?
-            %ul#promotion_paths
-            - @organization.promotion_paths.each do |path|
-              .clear
-                &nbsp;
-              .jbreadcrumb.grid_9
-                %ul
-                  %li
-                    =link_to 'Library', "#", :class => "crumb-nohover"
-                  - for env in path
-                    %li
-                      %a.subpanel_element{"data-url"=>edit_organization_environment_path(@organization.label, env.id)}
-                        %div
-                          #{env.name}
-
-          - else
-            .grid_7
-              #{_("No environments are available in this organization. Please add some environments to be able register systems to this organization.")}:
-
-        .clear
-          &nbsp;
-
-        - if editable && Katello.config.katello?
-          .button.subpanel_element{"data-url"=>new_organization_environment_path(@organization.label)}
-            = _("Add New Environment")
-
-        - if editable && Katello.config.katello?
-          = render :partial=>"download_debug_certificate"
-
-= content_for :footer do
-  = render :partial => "katello/organizations/footer"
-
-= render :template => "katello/layouts/tupane_layout"
diff --git a/app/views/katello/organizations/_environments.html.haml b/app/views/katello/organizations/_environments.html.haml
deleted file mode 100644
index a587fd53fbb..00000000000
--- a/app/views/katello/organizations/_environments.html.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-= environment_selector(:path_widget_class=>"grid_10", :path_entries_class=>"grid_10", :library_clickable=>true,
-  :accessible_envs=>accessible_envs)
diff --git a/app/views/katello/organizations/_events.html.haml b/app/views/katello/organizations/_events.html.haml
deleted file mode 100644
index 9c8ab491fd5..00000000000
--- a/app/views/katello/organizations/_events.html.haml
+++ /dev/null
@@ -1,29 +0,0 @@
-= javascript 'katello/widgets/jquery.jeditable.helpers'
-
-= content_for :title do
-  = @organization.name
-
-= content_for :navigation do
-  = render_subnav_menu(1..2, organization_navigation)
-
-= content_for :content do
-  #events
-    %table.scroll-panel
-      %thead
-        %th.column_1
-          = _("Time")
-        %th
-          = _("Message")
-      %tbody
-        - if !entries.nil? && entries.length > 0
-          - entries.each do |entry|
-            %tr{:class => cycle(nil, 'alt')}
-              %td.column_1
-                = format_time(entry['timestamp'])
-              %td
-                = entry['message']
-        - else
-          %tr
-            %td{:colspan=>"3"} #{_("No event history found for %s") % [@organization.name]}
-
-= render :template => "katello/layouts/tupane_layout"
diff --git a/app/views/katello/organizations/_footer.html.haml b/app/views/katello/organizations/_footer.html.haml
deleted file mode 100644
index bc799939c64..00000000000
--- a/app/views/katello/organizations/_footer.html.haml
+++ /dev/null
@@ -1,15 +0,0 @@
--#
-  Copyright 2013 Red Hat, Inc.
-
-  This software is licensed to you under the GNU General Public
-  License as published by the Free Software Foundation; either version
-  2 of the License (GPLv2) or (at your option) any later version.
-  There is NO WARRANTY for this software, express or implied,
-  including the implied warranties of MERCHANTABILITY,
-  NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-  have received a copy of GPLv2 along with this software; if not, see
-  http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
-.fr
-  %label.fr{:for=>"org_#{@organization.id}", :class=>"label_default_org", :id=>"label_org_#{@organization.id}"}
-    #{@org_label}
diff --git a/app/views/katello/organizations/_new.html.haml b/app/views/katello/organizations/_new.html.haml
deleted file mode 100644
index f1124b13c58..00000000000
--- a/app/views/katello/organizations/_new.html.haml
+++ /dev/null
@@ -1,39 +0,0 @@
-= content_for :title do
-  #{_("New Organization")}
-
-= content_for :navigation do
-  / pretty
-
-= content_for :content do
-  = kt_form_for Organization.new do |form|
-
-    = form.text_field :name, :label => _("Name"), :class => :name_input
-    = form.field :orglabel, :label => _("Label") do
-      = text_field_tag 'organization[label]', nil, :tabindex => form.tabindex, :size => 30, :class => :label_input, 'data-url' => default_label_organizations_path()
-      = image_tag "katello/icons/spinner.gif", :class => 'label_spinner hidden'
-
-    = form.text_area :description, :label => _("Description"), :size => "40x5", :maxlength => default_description_limit
-
-    - if Katello.config.katello?
-      %h5 #{_("Initial Application Life Cycle Management Environment")}:
-
-      = form.field :envname, :label => _("Name") do
-        = text_field_tag 'environment[name]', nil, :tabindex => form.tabindex, :size => 30, :class => :name_input
-
-      = form.field :envlabel, :label => _("Label") do
-        = text_field_tag 'environment[label]', nil, :tabindex => form.tabindex, :size => 30, :class => :label_input, 'data-url' => default_label_organizations_path()
-        = image_tag "katello/icons/spinner.gif", :class => 'label_spinner hidden'
-
-      = form.field :envdescription, :label => _("Description") do
-        = text_area_tag 'environment[description]', nil, :tabindex => form.tabindex, :size => "40x5"
-
-      %fieldset
-        %div.prefix_2
-          %label= _("Note: This will be set as your initial default environment.")
-
-    - else
-      = hidden_field_tag 'environment[label]', 'Library'
-
-    = form.submit _("Save"), :class => :create_button
-
-= render :template => "katello/layouts/tupane_layout"
diff --git a/app/views/katello/organizations/_post_delete.js.haml b/app/views/katello/organizations/_post_delete.js.haml
deleted file mode 100644
index 24bea23f463..00000000000
--- a/app/views/katello/organizations/_post_delete.js.haml
+++ /dev/null
@@ -1,3 +0,0 @@
-!= "KT.panel.closeSubPanel($('#subpanel'));"
-!= "KT.panel.closeSubPanel($('#panel'));"
-!= "KT.panel.list.remove('#{escape_javascript(id.to_s)}');"
\ No newline at end of file
diff --git a/app/views/katello/organizations/index.html.haml b/app/views/katello/organizations/index.html.haml
deleted file mode 100644
index 4cc7f98232d..00000000000
--- a/app/views/katello/organizations/index.html.haml
+++ /dev/null
@@ -1,14 +0,0 @@
-#orgs
-  .grid_16
-    = help_tip_button
-    - if Katello.config.katello?
-      = help_tip(_("Organizations allow content and systems to be separated by logical divisions.  " + |
-                   "To edit the environments within an organization, click on that organization and then click " + |
-                   "on the desired environment." )) |
-    - else
-      = help_tip(_("Organizations allow content and systems to be separated by logical divisions."))
-
-  .grid_16#main
-    = two_panel(@organizations, @panel_options)
-
-= javascript 'katello/organizations'
diff --git a/app/views/katello/products/_edit.html.haml b/app/views/katello/products/_edit.html.haml
deleted file mode 100644
index e73391fb2cc..00000000000
--- a/app/views/katello/products/_edit.html.haml
+++ /dev/null
@@ -1,38 +0,0 @@
-= javascript 'widgets/jquery.jeditable.helpers', 'products/product_edit'
-
-= content_for :title do
-  = _("Provider: ") + @provider.name
-
-= content_for :remove_item do
-  - if editable
-    = link_to _("Remove Product"), {:controller=>"products", :action=>"destroy"}, :confirm => _('Are you sure you want to remove this product?'), :method => :delete, :class=>"remove_item", :remote=>true
-
-= content_for :subcontent do
-  %h3
-    = _("Edit Product")
-
-  %fieldset
-    .grid_2.ra
-      %label #{_("Name")}:
-    .grid_5.la.multiline#product_name #{@product.name}
-
-  %fieldset
-    .grid_2.ra
-      %label #{_("Label")}:
-    .grid_5.la.multiline#product_label #{@product.label}
-
-  %fieldset
-    .grid_2.ra
-      %label #{_("Description")}:
-    .grid_5.la.multiline{'name' => 'product[description]', :class=>("editable edit_textarea" if editable), 'data-maxlength' => default_description_limit, 'data-url' => provider_product_path(@provider.id)}<> #{@product.description}
-
-  %fieldset
-    .grid_2.ra
-      %label #{_("GPG Key")}:
-    - if gpg_keys.length != 0
-      .grid_5.la{'name' => 'product[gpg_key]', 'class' => ("editable edit_select_product_gpg" if editable), 'data-url' => provider_product_path(@provider.id), 'data-options' => gpg_keys_edit } #{@product.gpg_key.name if @product.gpg_key}
-    - else
-      .grid_5.la
-        #{_("None defined for this Organization.")}
-
-= render :template => "layouts/tupane_layout"
diff --git a/app/views/katello/products/_new.html.haml b/app/views/katello/products/_new.html.haml
deleted file mode 100644
index 3ef7a438455..00000000000
--- a/app/views/katello/products/_new.html.haml
+++ /dev/null
@@ -1,27 +0,0 @@
-= javascript 'widgets/subpanel_new'
-
-= content_for :title do
-  #{_("Create Product")}
-
-= content_for :subcontent do
-  = kt_form_for [@provider, Product.new], :remote => true, :html => {:id => "new_subpanel"} do |form|
-
-    = form.text_field :name, :label => _("Name"), :class => :name_input
-
-    = form.field :label, :label => _("Label") do
-      = text_field_tag 'product[label]', nil, :tabindex => form.tabindex, :size => 30, :class => :label_input, 'data-url' => default_label_provider_products_path(@provider.id)
-      = image_tag "icons/spinner.gif", :class => 'label_spinner hidden'
-
-    = form.text_area :description, :label => _("Description"), :size => "40x5", :maxlength => default_description_limit
-
-    = form.field :gpg_key, :label => _("GPG Key") do
-      - if gpg_keys.present?
-        = select_tag 'product[gpg_key]', options_from_collection_for_select(gpg_keys, "id", "name"), :include_blank => true, :tabindex => form.tabindex
-        - help_message = _("GPG Keys are not required.  This field may be left blank.")
-        %span.tipsify.details_icon-grey{:title => help_message}
-      - else
-        = _("None defined for this Organization.")
-
-    = form.submit _("Create"), :class => 'subpanel_create create_button'
-
-= render :template => "layouts/tupane_layout"
diff --git a/app/views/katello/puppet_modules/_show.html.haml b/app/views/katello/puppet_modules/_show.html.haml
deleted file mode 100644
index 96cec0cb3dd..00000000000
--- a/app/views/katello/puppet_modules/_show.html.haml
+++ /dev/null
@@ -1,88 +0,0 @@
-.details_container
-  .item-container
-    %label.fl.ra
-      = _("ID")
-    %p
-      = @puppet_module.id
-
-  .item-container
-    %label.fl.ra
-      = _("Author: ")
-    %p
-      = @puppet_module.author
-
-  .item-container
-    %label.fl.ra
-      = _("Name: ")
-    %p
-      = @puppet_module.name
-
-  .item-container
-    %label.fl.ra
-      = _("Version: ")
-    %p
-      = @puppet_module.version
-
-  - unless @puppet_module.summary.blank?
-    .item-container
-      %label.fl.ra
-        = _("Summary: ")
-      %p
-        = @puppet_module.summary
-
-  - unless @puppet_module.description.blank?
-    .item-container
-      %label.fl.ra
-        = _("Description: ")
-      %p
-        = @puppet_module.description
-
-  - unless @puppet_module.license.blank?
-    .item-container
-      %label.fl.ra
-        = _("License: ")
-      %p
-        = @puppet_module.license
-
-  - unless @puppet_module.project_page.blank?
-    .item-container
-      %label.fl.ra
-        = _("Project Page: ")
-      %p
-        = @puppet_module.project_page
-
-  - unless @puppet_module.source.blank?
-    .item-container
-      %label.fl.ra
-        = _("Source: ")
-      %p
-        = @puppet_module.source
-
-  - unless @puppet_module.dependencies.blank?
-    .item-container
-      %label.fl.ra
-        = _("Dependencies: ")
-      %p
-        &nbsp;
-      %p
-        - @puppet_module.dependencies.each do |dependency|
-          %p
-            = _("Name: %{module_name}, Version: %{version}") % {:module_name => dependency[:name], :version => dependency[:version_requirement]}
-
-  - unless @puppet_module.checksums.blank?
-    .item-container
-      %label.fl.ra
-        = _("Checksums: ")
-      %p
-        &nbsp;
-      %p
-        - @puppet_module.checksums.each do |checksum|
-          %p
-            = _("File: %{file_name}, Checksum: %{checksum}") % {:file_name => checksum[0], :checksum => checksum[1]}
-
-  - unless @puppet_module.tag_list.blank?
-    .item-container
-      %label.fl.ra
-        = _("Tag List: ")
-      %p
-        = @puppet_module.tag_list.join(', ')
\ No newline at end of file
diff --git a/app/views/katello/repositories/_edit.html.haml b/app/views/katello/repositories/_edit.html.haml
deleted file mode 100644
index 204991e0a7f..00000000000
--- a/app/views/katello/repositories/_edit.html.haml
+++ /dev/null
@@ -1,64 +0,0 @@
-= javascript 'widgets/jquery.jeditable.helpers'
-
-= javascript do
-  :plain
-    $(document).ready(function() {
-        $('.remove_item.disabled').tipsy({ fade:true, gravity:'s', delayIn:500, html:true, className:'content-tipsy', title:function() { return $('.hidden-text.hidden').html();} });
-    });
-
-
-= content_for :title do
-  = _("Product: ") + @product.name
-
-= content_for :remove_item do
-  -if editable
-    = link_to _("Remove Repository"), {:controller=>"repositories", :action=>"destroy"}, :confirm => _('Are you sure you want to remove this repository?'), :method => :delete, :class=>"remove_item", :remote=>true
-  -else
-    .remove_item.disabled
-      #{_("Remove Repository")}
-    %span.hidden-text.hidden
-      .la.content-tipsy
-        = _("Before removing this repository from the product, it must first be deleted from the following environments using a deletion changeset: ") + cloned_in_environments.join(', ')
-
-
-= content_for :subcontent do
-  %h3
-    = _("Repository Details")
-
-  %fieldset
-    .grid_2.ra
-      %label #{_("Name")}:
-    .grid_5.la.multiline#repo_name{'name' => 'repo[name]', 'data-url' => provider_path(@provider.id)} #{@repository[:name]}
-
-  %fieldset
-    .grid_2.ra
-      %label #{_("Label")}:
-    .grid_5.la.multiline#repo_label #{@repository[:label]}
-
-  %fieldset
-    .grid_2.ra
-      %label #{_("Type")}:
-    .grid_5.la.multiline#repo_type #{@repository[:content_type]}
-
-  %fieldset
-    .grid_2.ra
-      %label #{_("URL")}:
-    .grid_5.la{'name' => 'repo[feed]', 'data-url' => provider_path(@provider.id)} #{@repository.feed}
-
-  %fieldset
-    .grid_2.ra
-      %label #{_("Publish via http")}
-    .grid_5.la
-      = @repository.unprotected ? _("Yes") : _("No")
-
-  - unless @repository.content_type == Repository::PUPPET_TYPE
-    %fieldset
-      .grid_2.ra
-        %label #{_("GPG Key")}:
-      - if gpg_keys.length != 0
-        .grid_5.la{'name' => 'gpg_key', 'class' => ("editable edit_select" if editable), 'data-url' => update_repo_gpg_key_provider_product_repository_path(@provider.id, @product.id, @repository.id), 'data-options' => gpg_keys_edit } #{@repository.gpg_key.name if @repository.gpg_key}
-      - else
-        .grid_5.la
-          #{_("None defined for this Organization.")}
-
-= render :template => "layouts/tupane_layout"
diff --git a/app/views/katello/repositories/_new.html.haml b/app/views/katello/repositories/_new.html.haml
deleted file mode 100644
index fb577055f5e..00000000000
--- a/app/views/katello/repositories/_new.html.haml
+++ /dev/null
@@ -1,60 +0,0 @@
-= javascript 'widgets/subpanel_new'
-
-= content_for :title do
-  = _("Product: ") + @product.name
-
-= content_for :subcontent do
-  %h3#new_repo
-    = _("Create Repository")
-  .clear
-    &nbsp;
-  = form_tag provider_product_repositories_path(@provider.id, @product.id), :id => "new_subpanel", :method => "post", :remote => true do
-    %fieldset.clearfix
-      .grid_2.ra
-        = label :repo, :name, _("Name")
-      .grid_5.la
-        = text_field :repo, :name, :class=>:name_input, :tabindex => auto_tab_index
-
-    %fieldset.clearfix
-      .grid_2.ra
-        = label :repo, :label, _("Label")
-      .grid_5.la
-        = text_field :repo, :label, :class=>:label_input, :tabindex => auto_tab_index, 'data-url' => default_label_provider_product_repositories_path(@provider.id, @product.id)
-        = image_tag "icons/spinner.gif", :class => 'label_spinner hidden'
-
-    %fieldset.clearfix
-      .grid_2.ra
-        = label :repo, :feed, _("Type")
-      .grid_5.la
-        = select_tag 'repo[content_type]',
-          options_for_select([Repository::YUM_TYPE, Repository::PUPPET_TYPE], Repository::YUM_TYPE),
-          :tabindex => auto_tab_index
-
-    %fieldset.clearfix
-      .grid_2.ra
-        = label :repo, :feed, _("URL")
-      .grid_5.la
-        = text_field :repo, :feed, :id=>"repo_url_field", :tabindex => auto_tab_index
-
-    %fieldset.clearfix
-      .grid_2.ra
-        = label :repo, :unprotected, _("Publish via http")
-      .grid_5.la
-        = check_box :repo, :unprotected, :id=>"unprotected", :tabindex => auto_tab_index, :checked=>false
-
-
-    %fieldset.clearfix#gpg_key
-      .grid_2.ra
-        = label :repo, :gpg_key, _("GPG Key")
-      .grid_5.la
-        - if gpg_keys.length != 0
-          = select_tag 'repo[gpg_key]', options_from_collection_for_select(gpg_keys, "id", "name", :selected => (@product.gpg_key.id if @product.gpg_key )), :include_blank => true, :tabindex => auto_tab_index
-          - help_message = _("GPG Keys are not required.  This field may be left blank.")
-          %span.tipsify.details_icon-grey{:title => help_message}
-        - else
-          #{_("None defined for this Organization.")}
-
-    .grid_5.prefix_2
-      = submit_tag _("Create"), :class => 'fr subpanel_create create_button', :tabindex => auto_tab_index
-
-= render :template => "layouts/tupane_layout"
diff --git a/app/views/katello/subscriptions/_consumers.html.haml b/app/views/katello/subscriptions/_consumers.html.haml
deleted file mode 100644
index a1bb150217f..00000000000
--- a/app/views/katello/subscriptions/_consumers.html.haml
+++ /dev/null
@@ -1,53 +0,0 @@
-
-= render :partial => "subscriptions_tupane_header_nav"
-
-= content_for :content do
-  .grid_10
-    %table#systems_table
-      %thead
-        %th #{_("Systems")}
-      %tbody
-        - if systems.length < 1
-          %tr
-            %td
-              = _("None")
-        - else
-          - systems.each do |system|
-            - cycle_class = cycle("", "alt")
-            %tr{:class => cycle_class}
-              %td
-                = system_link_helper system.uuid
-
-    - reset_cycle
-    %table#actkeys_table
-      %thead
-        %th #{_("Activation Keys")}
-      %tbody
-        - if activation_keys.length < 1
-          %tr
-            %td
-              = _("None")
-        - else
-          - activation_keys.each do |key|
-            - cycle_class = cycle("", "alt")
-            %tr{:class => cycle_class}
-              %td
-                = activation_key_link_helper key
-
-    - reset_cycle
-    %table#distributors_table
-      %thead
-        %th #{_("Subscription Management Applications")}
-      %tbody
-        - if distributors.length < 1
-          %tr
-            %td
-              = _("None")
-        - else
-          - distributors.each do |distributor|
-            - cycle_class = cycle("", "alt")
-            %tr{:class => cycle_class}
-              %td
-                = distributor_link_helper distributor
-
-= render :template => "katello/layouts/tupane_layout"
diff --git a/app/views/katello/subscriptions/_edit.html.haml b/app/views/katello/subscriptions/_edit.html.haml
deleted file mode 100644
index 6fa9932aaf1..00000000000
--- a/app/views/katello/subscriptions/_edit.html.haml
+++ /dev/null
@@ -1,119 +0,0 @@
-= javascript "katello/widgets/jquery.jeditable.helpers"
-= render :partial => "subscriptions_tupane_header_nav"
-
-= content_for :content do
-  #subscription
-    %form.form
-      %input#panel_element_id{:name=>@subscription.id, :type=>"hidden", :value=>"#{name}_#{subscription.id.to_s}", "data-ajax_url"=>url_for(:action=>"update")}
-        %h5 #{_("Subscription Info")}
-        .control-group
-          .label
-            = label :name, :name, _("Name")
-          .input
-            .value
-              = @subscription.product_name
-        .control-group
-          .label
-            = label :name, :name, _("Description")
-          .input
-            .value
-              = @subscription.description
-        .control-group
-          .label
-            = label :consumed, :consumed, _("Consumed")
-          .input
-            .value
-              - if @subscription.quantity < 0
-                = _("Unlimited")
-              - else
-                = _("%{consumed} of %{total}") % {:consumed => @subscription.consumed, :total => @subscription.quantity}
-        .control-group
-          .label
-            = label :date_range, :date_range, _("Starts / Ends")
-          .input
-            .value
-              = _("%{start_date} / %{end_date}") % {:start_date => format_time(@subscription.start_date), :end_date => format_time(@subscription.end_date)}
-        .control-group
-          .label
-            = label :contract, :contract, _("Contract Number")
-          .input
-            .value
-              = @subscription.contract_number
-        .control-group
-          .label
-            = label :account, :account, _("Account Number")
-          .input
-            .value
-              = @subscription.account_number
-        .control-group
-          .label
-            = label :supportLevel, :supportLevel, _("Support Level")
-          .input
-            .value
-              = @subscription.support_level
-        .control-group
-          .label
-            = label :supporttype, :supporttype, _("Support Type")
-          .input
-            .value
-              = @subscription.support_type
-        .control-group
-          .label
-            = label :arch, :arch, _("Arch")
-          .input
-            .value
-              = @subscription.arch
-        .control-group
-          .label
-            = label :systype, :systype, _("Type")
-          .input
-            .value
-              = @subscription.virt_only ? _("Virtual Only") : _("Physical or Virtual")
-        .control-group
-          .label
-            = label :limits, :limits, _("Limits")
-          .input
-            .value
-              = subscription_limits_helper(@subscription)
-        .control-group
-          .label
-            = label :multientitlement, :multientitlement, _("Multi-entitlement")
-          .input
-            .value
-              = @subscription.multi_entitlement ? _("Yes") : _("No")
-        .control-group
-          .label
-            = label :instance_based, :instance_based, _("Instance-based")
-          .input
-            .value
-              = @subscription.instance_multiplier ? _("Yes") : _("No")
-        - if @subscription.stacking_id != ''
-          .control-group
-            .label
-              = label :stacking, :stacking, _("Stacking ID")
-            .input
-              .value
-                = @subscription.stacking_id
-        - if !@subscription.source_pool_id.nil?
-          .control-group
-            .label
-              = label :sourcepool, :sourcepool, _("Virt Guest From")
-            .input
-              .value
-                = subscriptions_pool_link_helper(@subscription.product_name, @subscription.source_pool_id, current_organization.redhat_provider.id, current_organization)
-        - if !@subscription.host_id.nil?
-          .control-group
-            .label
-              = label :host, :host, _("Required Host")
-            .input
-              .value
-                = system_link_helper @subscription.host_id
-      - if @subscription.provided_products.length > 0
-        %h5 #{_("Provided Products")}
-        .control-group
-          .input
-            - @subscription.provided_products.each do |providedProduct|
-              .grid_8.la
-                = providedProduct['productName']
-
-= render :template => "katello/layouts/tupane_layout"
diff --git a/app/views/katello/subscriptions/_edit_manifest.html.haml b/app/views/katello/subscriptions/_edit_manifest.html.haml
deleted file mode 100644
index 686fbdbad72..00000000000
--- a/app/views/katello/subscriptions/_edit_manifest.html.haml
+++ /dev/null
@@ -1,59 +0,0 @@
-= javascript 'katello/widgets/jquery.jeditable.helpers'
-
-= content_for :title do
-  #{_("Subscription Manifest")}
-
-= render :partial => "subscriptions_tupane_header_new_nav"
-
-= content_for :content do
-  #manifest
-    %input#panel_element_id{:name=>@provider.id, :type=>"hidden", :value=>"#{@provider.name}_#{@provider.id.to_s}", "data-ajax_url"=>url_for(:action=>"refresh_manifest")}
-    .grid_12#manifest_info
-      %h5 #{_('Subscription Details')}
-      %fieldset
-        .grid_3.ra.fieldset
-          %label #{_("Upstream Subscription Management Application")}
-        - if @upstream['uuid']
-          .grid_8.la.fl
-            = subscriptions_manifest_link_helper({'webAppPrefix'=>@upstream['webUrl'], 'upstreamId'=>@upstream['uuid']}, @upstream['name'])
-        - else
-          #{_('No subscription manifest imported')}
-      %fieldset
-        .grid_3.ra.fieldset
-          %label #{_("Upstream Type")}
-        - if @upstream['type']
-          .grid_8.la.fl
-            #{@upstream['type']['label']}
-      %fieldset
-        .grid_3.ra.fieldset
-          %label #{_("Upstream User")}
-        - if @upstream['generatedBy']
-          .grid_8.la.fl
-            #{@upstream['generatedBy']}
-      %fieldset
-        .grid_3.ra.fieldset
-          %label #{_("Generated On")}
-        - if @upstream['generatedDate']
-          .grid_8.la.fl
-            = format_time(Time.parse(@upstream['generatedDate']))
-      %fieldset
-        .grid_3.ra.fieldset
-          %label #{_("Last Updated")}
-        - if @upstream['updated']
-          .grid_8.la.fl
-            = format_time(Time.parse(@upstream['updated']))
-
-      %h5 #{_('Subscription Server Details')}
-      - status = subscriptions_candlepin_status
-      %fieldset
-        .grid_3.ra.fieldset
-          %label #{_("Rules Source")}
-        .grid_8.la.fl
-          #{status['rulesSource']}
-      %fieldset
-        .grid_3.ra.fieldset
-          %label #{_("Rules Version")}
-        .grid_8.la.fl
-          #{status['rulesVersion']}
-
-= render :template => "katello/layouts/tupane_layout"
diff --git a/app/views/katello/subscriptions/_history.html.haml b/app/views/katello/subscriptions/_history.html.haml
deleted file mode 100644
index cbab3e6f7ea..00000000000
--- a/app/views/katello/subscriptions/_history.html.haml
+++ /dev/null
@@ -1,32 +0,0 @@
-= javascript "katello/widgets/jquery.jeditable.helpers"
-
-.grid_8
-  #providers
-    %input#panel_element_id{:name => @provider.id, :type => "hidden", :value => "#{@provider.name}_#{@provider.id}"}
-    #provider
-      %h4 #{_("Import History")}
-
-#subscription_history
-  .grid_16
-    %table
-      %thead
-        %th #{_("Message")}
-        %th #{_("Import Time")}
-      - if @statuses
-        %tbody
-          - @statuses.each do |status|
-            - cycle_class = cycle(nil, 'alt')
-            %tr{:class => cycle_class}
-              %td{:style => "width: 70%;"}
-                %span.icon_wrap.fl
-                  %span.fl{:class => (status["status"] == "FAILURE" ? "shield_icon-black" : "check_icon-black")}
-                = status["statusMessage"]
-              %td
-                = _("%s ago") % time_ago_in_words(status["created"])
-            - if status['webUrl']
-              - status['webUrl'] += '/' if !status['webUrl'].end_with?('/')
-              %tr{:class => cycle_class}
-                %td{:colspan => 2}
-                  &nbsp; &nbsp; &nbsp;
-                  = _('Manifest from %s') % status['upstreamName']
-                  = link_to status['webAppPrefix'], "http://#{status['webAppPrefix']}#{status['upstreamId']}", :target => '_blank'
diff --git a/app/views/katello/subscriptions/_history_items.html.haml b/app/views/katello/subscriptions/_history_items.html.haml
deleted file mode 100644
index a371f7cf92c..00000000000
--- a/app/views/katello/subscriptions/_history_items.html.haml
+++ /dev/null
@@ -1,33 +0,0 @@
-= javascript "katello/widgets/jquery.jeditable.helpers"
-
-= content_for :title do
-  #{_("Subscription Manifest")}
-
-= render :partial => "subscriptions_tupane_header_new_nav"
-
-= content_for :content do
-  #subscription_history
-    .grid_13
-      %table
-        %thead
-          %th #{_("Message")}
-          %th #{_("Import Time")}
-        - if @statuses
-          %tbody
-            - @statuses.each do |status|
-              - cycle_class = cycle(nil, 'alt')
-              %tr{:class => cycle_class}
-                %td{:style => "width: 400px;"}
-                  %span.icon_wrap.fl
-                    %span.fl{:class => (status["status"] == "FAILURE" ? "shield_icon-black" : "check_icon-black")}
-                  = status["statusMessage"]
-                %td
-                  = _("%s ago") % time_ago_in_words(status["created"])
-              - if status['webAppPrefix']
-                %tr{:class => cycle_class}
-                  %td{:colspan => 2}
-                    &nbsp; &nbsp; &nbsp;
-                    = _('Manifest from %s') % status['upstreamName']
-                    = subscriptions_manifest_link_helper status
-
-= render :template => "katello/layouts/tupane_layout"
diff --git a/app/views/katello/subscriptions/_list_subscription.html.haml b/app/views/katello/subscriptions/_list_subscription.html.haml
deleted file mode 100644
index 97bcc42dc63..00000000000
--- a/app/views/katello/subscriptions/_list_subscription.html.haml
+++ /dev/null
@@ -1,3 +0,0 @@
-.block.tall{:id=>"#{name}_#{item.cp_id}", "data-ajax_url" => "#{url_for(:controller=>controller.controller_name)}/#{item.cp_id}", "data-ajax_panelpage" => 'edit'}
-
-  = render :partial => "katello/subscriptions/list_subscription_show", :locals => { :item => item }
diff --git a/app/views/katello/subscriptions/_list_subscription_show.html.haml b/app/views/katello/subscriptions/_list_subscription_show.html.haml
deleted file mode 100644
index ee90b55a922..00000000000
--- a/app/views/katello/subscriptions/_list_subscription_show.html.haml
+++ /dev/null
@@ -1,21 +0,0 @@
-%div
-  %div{:class=>'column_1'}
-    %div.one-line-ellipsis{:style=>"padding-top: 2px; font-weight: bold;"}
-      = item.product_name
-%div
-  %div{:class=>'column_2'}
-    %ul
-      %li
-        - if item.quantity < 0
-          = _("Consumed: Unlimited")
-        - else
-          = _("Consumed: %{consumed} of %{total}") % {:consumed => item.consumed, :total => item.quantity}
-      %li
-        = _("Expires: %s") % format_time(item.end_date)
-  %div{:class=>'column_2'}
-    %ul
-      %li
-        = _("SLA: %s") % item.support_level
-      %li
-        = item.pool_derived ? _('Virtual Guest') : ''
-.arrow-right
diff --git a/app/views/katello/subscriptions/_list_subscriptions.html.haml b/app/views/katello/subscriptions/_list_subscriptions.html.haml
deleted file mode 100644
index edc96da6588..00000000000
--- a/app/views/katello/subscriptions/_list_subscriptions.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-= render :partial => "katello/subscriptions/list_subscription", :collection => collection, :as => :item, :locals => { :accessor => accessor, :columns => columns, :name => name }
diff --git a/app/views/katello/subscriptions/_new.html.haml b/app/views/katello/subscriptions/_new.html.haml
deleted file mode 100644
index 18cd202e0b1..00000000000
--- a/app/views/katello/subscriptions/_new.html.haml
+++ /dev/null
@@ -1,134 +0,0 @@
-= javascript "katello/widgets/jquery.jeditable.helpers"
-
-= content_for :title do
-  #{_("Subscription Manifest")}
-
-= render :partial => "subscriptions_tupane_header_new_nav"
-
-= content_for :content do
-  #subscription
-    .full
-      = help_tip_button('subscriptions-help')
-      = help_tip(_("If you have a subscription manifest you may upload it below. " + |
-                 "This manifest may be obtained by visiting the Red Hat Customer Portal or by contacting your support representative."), 'subscriptions-help') |
-
-    .full
-      %h5 #{_("Red Hat Provider Details")}
-    .full
-      %input#panel_element_id{:name => @provider.id, :type => "hidden", :value => "#{@provider.name}_#{@provider.id}"}
-      %fieldset
-        .grid_3.ra.fieldset
-          = label :red_hat_provider, :url, _("Repository Url")
-        .grid_9.la.fl#repo_url{'name' => 'provider[repository_url]',:class=>("editable edit_textfield" if @provider.editable?),  'data-url' => provider_path(@provider.id)} #{@provider[:repository_url]}
-    .clear
-    - if @upstream['uuid']
-      .full
-        %h5 #{_("Subscription Manifest")}
-      .full
-        %fieldset
-          .grid_3.ra.fieldset
-            =label :uuid, :uuid, _("Upstream Subscription Management Application")
-          .grid_9.la.fl
-            = subscriptions_manifest_link_helper({'webAppPrefix'=>@upstream[:webUrl], 'upstreamId'=>@upstream['uuid']}, @upstream['name'])
-        %fieldset
-        - if @provider.editable?
-          - if !@provider.manifest_task || @provider.manifest_task.finished?
-            .grid_3.ra.fieldset
-              &nbsp;
-            - if can_refresh
-              = form_for @provider, :html => {:method => :post, :id => :refresh_manifest}, :remote => true, :url => refresh_manifest_subscriptions_path do |f|
-                .grid_2.la#refresh_button
-                  = f.submit _("Refresh Manifest"), :id => :refresh_form_button
-            -else
-              .grid_6.la
-                = _("Refreshing manifest not supported by this manifest.")
-            = form_for @provider, :html => {:method => :post, :id => :delete_manifest}, :remote => true, :url => delete_manifest_subscriptions_path do |f|
-              .grid_4.la#delete_button
-                = f.submit _("Delete Manifest"), :id => :delete_form_button, :confirm => _("Deleting a manifest " + |
-                          "will permanently remove all current subscriptions. All systems consuming these subscriptions " + |
-                          "have them removed. Do you wish to proceed with removing this manifest?") |
-          - elsif @provider.manifest_task && !@provider.manifest_task.finished? && (@provider.manifest_task.task_type == "delete manifest" || @provider.manifest_task.task_type == "refresh manifest")
-            .grid_10
-              %fieldset
-                .grid_3.ra.fieldset
-                  &nbsp;
-                .grid_6.la
-                  .fl
-                    %div.manifest_progress{:provider_id=>@provider.id}
-                      = image_tag("katello/icons/spinner.gif", { :class => "fl" })
-                      .fl.manifest_progress_message
-                        - if @provider.manifest_task.task_type == "delete manifest"
-                          = _("Delete in progress (%s)") % @provider.manifest_task.state
-                        - else
-                          = _("Refresh in progress (%s)") % @provider.manifest_task.state
-    .clear
-    - if @provider.editable?
-      - if @provider.manifest_task && !@provider.manifest_task.finished?
-        - if @provider.manifest_task.task_type == "import manifest"
-          .grid_10
-            %h5 #{_("Upload New Manifest")}
-          .full
-            %fieldset
-              .grid_3.ra.fieldset
-                =label :upload, :upload, _("Manifest File")
-              .grid_8.la
-                .fl
-                  %div.manifest_progress{:provider_id=>@provider.id}
-                    = image_tag("katello/icons/spinner.gif", { :class => "fl" })
-                    .fl.manifest_progress_message
-                      = _("Import in progress (%s)") % @provider.manifest_task.state
-      - else
-        .full
-          %h5 #{_("Upload New Manifest")}
-          = form_for @provider, :html => {:multipart => true, :method => :post, :id => :upload_manifest}, :remote => true, :url => upload_subscriptions_path do |f|
-            .full
-              %fieldset
-                .grid_3.ra.fieldset
-                  =label :upload, :upload, _("Manifest File")
-                .grid_6.la
-                  = f.file_field :contents
-              %fieldset
-                .grid_3.ra.fieldset
-                  &nbsp;
-                .grid_6.la#upload_button
-                  = f.submit _("Upload"), :id => :upload_form_button
-
-    .full
-      %h5 #{_("Manifest History")}
-      %table
-        %thead
-          %th #{_("Message")}
-          %th #{_("Time")}
-        - if @statuses
-          %tbody
-            - @statuses[0..2].each do |status|
-              - cycle_class = cycle(nil, 'alt')
-              %tr{:class => cycle_class}
-                %td{:style => "width: 400px;"}
-                  %span.icon_wrap.fl
-                    %span.fl{:class => (status["status"] == "FAILURE" ? "shield_icon-black" : "check_icon-black")}
-                  = status["statusMessage"]
-                %td
-                  = _("%s ago") % time_ago_in_words(status["created"])
-              - if status['webUrl']
-                %tr{:class => cycle_class}
-                  %td{:colspan => 2}
-                    &nbsp; &nbsp; &nbsp;
-                    = _('Manifest from %s') % status['upstreamName']
-                    = subscriptions_manifest_link_helper status
-
-          - if @statuses.length > 3
-            %tr{:class => cycle(nil, 'alt')}
-              %td.panel_link{:style => "width: 100%;"}
-                = link_to(_("More..."), subscriptions_path + "/history_items")
-              %td
-                &nbsp;
-
-- if @provider.task_status
-  = javascript do
-    :plain
-      $(document).ready(function() {
-        KT.subscription.startUpdater();
-      });
-
-= render :template => "katello/layouts/tupane_layout"
diff --git a/app/views/katello/subscriptions/_products.html.haml b/app/views/katello/subscriptions/_products.html.haml
deleted file mode 100644
index c130e1973ba..00000000000
--- a/app/views/katello/subscriptions/_products.html.haml
+++ /dev/null
@@ -1,52 +0,0 @@
-= javascript_include_tag 'katello/widgets/treetable'
-= render :partial => "subscriptions_tupane_header_nav"
-
-= content_for :content do
-  .grid_10
-    .tree
-      %table#products_table
-        %thead
-          %th #{_("Provided Product Details")}
-        %tbody
-          - @subscription.provided_products.each do |product|
-            - product = subscriptions_product_helper product['productId']
-            - cycle_class = cycle("", "alt")
-            %tr{:id => "#{product.cp_id}", :class => cycle_class}
-              %td
-                #{product.name}
-            - product.productContent.each do |productContent|
-              - cycle2_class = cycle("", "alt")
-              %tr{:class => "child-of-#{product.cp_id} " + cycle2_class}
-                %td
-                  %ul
-                    %li
-                      %hr{:width=>"75%"}
-                    %li
-                      = _('Content Download URL: ')
-                      = productContent['content']['contentUrl']
-                    %li
-                      = _('GPG Key URL: ')
-                      - productContent['content']['gpgUrl'].split(',').each do |link|
-                        - if link == 'http://'
-                          = _("None")
-                        - else
-                          = link
-                    %li
-                      = _('Repo Type: ')
-                      = productContent['content']['type']
-                    %li
-                      = _('Enabled by Default: ')
-                      = productContent['enabled']
-
-= javascript do
-  :plain
-    $(document).ready(function() {
-      $("#products_table").treeTable({
-        expandable: true,
-        initialState: "collapsed",
-        clickableNodeNames: true,
-        onNodeShow: function(){$.sparkline_display_visible()}
-      });
-    });
-
-= render :template => "katello/layouts/tupane_layout"
diff --git a/app/views/katello/subscriptions/_subscriptions_tupane_header_nav.html.haml b/app/views/katello/subscriptions/_subscriptions_tupane_header_nav.html.haml
deleted file mode 100644
index a9895beae5c..00000000000
--- a/app/views/katello/subscriptions/_subscriptions_tupane_header_nav.html.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-= content_for :title do
-  #{@subscription.product_name}
-
-= content_for :navigation do
-  = render_subnav_menu(1..2, subscriptions_navigation)
diff --git a/app/views/katello/subscriptions/_subscriptions_tupane_header_new_nav.html.haml b/app/views/katello/subscriptions/_subscriptions_tupane_header_new_nav.html.haml
deleted file mode 100644
index 8f27623df60..00000000000
--- a/app/views/katello/subscriptions/_subscriptions_tupane_header_new_nav.html.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-= content_for :navigation do
-  = render_subnav_menu(1..2, new_subscription_navigation)
diff --git a/app/views/katello/subscriptions/index.html.haml b/app/views/katello/subscriptions/index.html.haml
deleted file mode 100644
index 67d07fae14a..00000000000
--- a/app/views/katello/subscriptions/index.html.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-.grid_16
-  = two_panel(@subscriptions, @panel_options)
-
-= javascript 'katello/subscriptions'
diff --git a/app/views/katello/subscriptions/index_nutupane.html.haml b/app/views/katello/subscriptions/index_nutupane.html.haml
deleted file mode 100644
index 17416c84573..00000000000
--- a/app/views/katello/subscriptions/index_nutupane.html.haml
+++ /dev/null
@@ -1,15 +0,0 @@
-= javascript 'katello/subscriptions/subscriptions.controller', 'katello/widgets/nutupane', 'katello/components/scrollWithPage.directive.js', 'katello/components/inline_edit.directive', 'katello/components/input.directive', 'katello/filters/array-object-value.filter'
-
-%div{ 'ng-controller' => 'SubscriptionsController' }
-  %div{'ng-class' => '{"modal-mask": table.newPaneVisible}'}
-  %h1
-    = _("Subscriptions")
-  %div{ 'alch-table-toolbar' => 'table' }
-    %button.primary{'ng-click' => 'importManifest()'}
-      = _("Import Manifest")
-  %table#nutupane-table.table.stable.stripe-row{ 'alch-table' => 'table', 'row-select' => 'true', 'ng-class' => '{ "table-mask" : table.working, "details-visible": table.detailsVisible}' }
-  %div#nutupane-new-item.nutupane-pane{'ng-show' => 'table.newPaneVisible', 'ng-cloak' => true}
-    %a.fr{ 'ng-click' => 'table.setNewItemVisibility(false)' }
-      = 'x'
-    %div.nutupane-pane-content
-  %span.nutupane-details.panel.nutupane-pane#nutupane-details{ 'nutupane-details'=>'table.detailsVisible', 'model'=>'table', 'ng-class' => '{ "nutupane-details-open" : model.detailsVisible }' }
diff --git a/app/views/katello/system_events/_details.html.haml b/app/views/katello/system_events/_details.html.haml
deleted file mode 100644
index 5a5f601b4e0..00000000000
--- a/app/views/katello/system_events/_details.html.haml
+++ /dev/null
@@ -1,34 +0,0 @@
-= content_for :title do
-  = type
-
-= content_for :subcontent do
-  %h4
-    = format_time(task.finish_time)
-
-  %fieldset
-    .grid_7
-      %h5 #{_("Summary")}
-    .grid_7.multiline
-      = user_message
-
-  %fieldset
-    .grid_7
-      %h5 #{_("Request")}
-    .grid_7.la
-      = task.message
-
-  %fieldset
-    .grid_7
-      %h5 #{_("Parameters")}
-    .grid_7.la
-      = task.humanize_parameters
-
-  %fieldset
-    .grid_7
-      %h5 #{_("Result")}
-    .grid_7.multiline
-      - task.result_description.split("\n").each do |result|
-        = result
-        %br
-
-= render :template => "layouts/tupane_layout"
diff --git a/app/views/katello/system_events/_event_items.html.haml b/app/views/katello/system_events/_event_items.html.haml
deleted file mode 100644
index 75008e70df4..00000000000
--- a/app/views/katello/system_events/_event_items.html.haml
+++ /dev/null
@@ -1,27 +0,0 @@
-- if include_tr
-  - cssclass = cycle("alt", "")
-  <tr class = "#{cssclass} tasks">
-
-%td.event_name{"data-pending-task-id" => (t.id if t.pending?)}
-  - if t.pending?
-    = image_tag("icons/spinner.gif")
-  - else
-    %span.icon_wrap.fl.status_icons
-      %span.fl{:class=>(t.overall_status=="error" ? "error_icon" : "check_icon")}
-        &nbsp;&nbsp;
-
-  %a.event_status.subpanel_element{"data-url"=>system_event_path(system.id, t.id)}
-    - if t.pending?
-      = t.pending_message
-    - else
-      = t.message
-
-%td.event_date
-  - if t.pending?
-    = image_tag("icons/spinner.gif")
-    = t.message
-  - else
-    = format_time(t.finish_time)
-
-- if include_tr
-  </tr>
diff --git a/app/views/katello/system_events/_events.html.haml b/app/views/katello/system_events/_events.html.haml
deleted file mode 100644
index 6ba554a5a81..00000000000
--- a/app/views/katello/system_events/_events.html.haml
+++ /dev/null
@@ -1,36 +0,0 @@
-= javascript :system_events
-
-= render :partial => "katello/systems/system_tupane_header_nav"
-
-= content_for :content do
-  - if total_events_length > 0
-    .grid_8
-      %form#event_filter_form.clear
-        %input{ :name => "event_search", :type => "search",
-            :placeholder => _('Filter on loaded Events...'), :id=>"event_search_filter",
-             'data-search_url' => items_system_events_path(@system.id) }
-        %button.filter_button#event_filter_button #{('Filter')}
-        %br.clear
-
-      %table.filter_table.events.ajaxScroll{'data-url' => status_system_events_path(system.id), 'data-total_events' => total_events_length}
-        %thead
-          %th
-            %a#event_sort{"data-sort"=>"asc", :class=>"ascending"}
-              #{_("Event")}
-          %th
-            #{_("Date")}
-        %tbody#event_items
-          = render :partial => 'event_items', :locals => {:system => system, :include_tr => true}, :collection=> tasks, :as=>:t
-      #list-spinner
-        = image_tag("icons/spinner.gif", :class=>"ajax_scroll")
-  - else
-    %p #{_("There are no events to display.")}
-
-= content_for :footer do
-  .grid_8
-    - if current_user.page_size < total_events_length
-      %a#more{:style => "padding-left: 20px;", "data-scroll_url"=>url_for(more_events_system_events_path(@system.id)), "data-page_size"=>current_user.page_size, :class=>"fl"}
-    - if total_events_length > 0
-      %span{:id => 'loaded_summary', :style => "padding-left: 20px;"}
-
-= render :template => "katello/layouts/tupane_layout"
diff --git a/app/views/katello/system_events/_more_events.html.haml b/app/views/katello/system_events/_more_events.html.haml
deleted file mode 100644
index c679969146d..00000000000
--- a/app/views/katello/system_events/_more_events.html.haml
+++ /dev/null
@@ -1,3 +0,0 @@
-- if cycle_extra
-  = cycle("alt", "")
-= render :partial => 'event_items', :locals => {:system => system, :include_tr => true}, :collection=> tasks, :as=>:t
\ No newline at end of file
diff --git a/app/views/katello/system_groups/_edit.html.haml b/app/views/katello/system_groups/_edit.html.haml
deleted file mode 100644
index e34181b75a0..00000000000
--- a/app/views/katello/system_groups/_edit.html.haml
+++ /dev/null
@@ -1,52 +0,0 @@
-= javascript 'katello/widgets/jquery.jeditable.helpers'
-
-= render :partial => "katello/system_groups/tupane_header"
-
-= content_for :content do
-  #system_group_edit
-    %input{:name=> @group.id, :type => "hidden", :value => "#{name}_#{@group.id}", "data-ajax_url"=>url_for(:action=> 'update')}
-    .grid_8
-      %h5 #{_("System Group Info")}
-
-      = form_for(@group, :html => {:multipart => true, :method => :put, :id => 'system_group_edit', :remote => true}, :url => system_group_path(@group)) do |f|
-        %input#system_group_id{:name => @group.id, :type => "hidden", :value => "#{name}_#{@group.id}", "data-ajax_url"=>url_for(:action=> 'update')}
-        %fieldset.fl.clear
-          .grid_2.ra
-            %label #{_("Name")}:
-          .grid_5.la#system_group_name{'name' => 'system_group[name]', 'data-url' => system_group_path(@group.id), :class=>("edit_name editable" if editable)} #{@group.name}
-
-        %fieldset.fl.clear
-          .grid_2.ra
-            %label #{_("Description")}:
-          .grid_5.la{:style => "word-wrap: break-word;", 'name' => 'system_group[description]', 'data-maxlength' => default_description_limit, 'data-url' => system_group_path(@group.id), :class=>("editable edit_textarea" if editable)}<> #{@group.description}
-
-        %h5 #{_("System Properties")}
-
-        %fieldset.fl.clear
-          .grid_2.ra
-            %label #{_("Total")}:
-          .grid_5.la.panel_link
-            = link_to(@group.systems.length, systems_system_group_path(@group.id))
-
-        %fieldset.fl.clear
-          .grid_2.ra
-            %label #{_("System Limit")}:
-          .grid_8.la
-            - if @group.max_systems == -1
-              .grid_2.ra
-                %label #{_("Unlimited")}:
-              .grid_5.la
-                %input.unlimited_members{:type=>"checkbox", :value=>:true, :checked => :true}
-              .grid_2.ra.limit{:style => "display:none;"}
-                %label #{_("Limit")}:
-              .grid_5.la.limit#system_group_max_systems{'name' => 'system_group[max_systems]', 'data-url' => system_group_path(@group.id), :class=>("editable edit_max_systems" if editable), :style => "display:none;"}
-            - else
-              .grid_2.ra
-                %label #{_("Unlimited")}:
-              .grid_5.la
-                %input.unlimited_members{:type=>"checkbox", :value=>:true}
-              .grid_2.ra.limit
-                %label #{_("Limit")}:
-              .grid_5.la.limit#system_group_max_systems{'name' => 'system_group[max_systems]', 'data-url' => system_group_path(@group.id), :class=>("editable edit_max_systems" if editable)} #{@group.max_systems}
-
-= render :template => "katello/layouts/tupane_layout"
diff --git a/app/views/katello/system_groups/_edit_systems.html.haml b/app/views/katello/system_groups/_edit_systems.html.haml
deleted file mode 100644
index 97a5151e021..00000000000
--- a/app/views/katello/system_groups/_edit_systems.html.haml
+++ /dev/null
@@ -1,32 +0,0 @@
-= content_for :title do
-  = _("Edit Systems' Environment and Content View")
-
-= content_for :subcontent do
-
-  = form_tag update_systems_system_group_path(@group.id), :id => 'update_form',
-    :method => :put, :class => 'env_content_view_selector' do
-
-    = hidden_field_tag 'update_fields[environment_id]', @environment.id, :id => :environment_id
-
-    %fieldset
-      .grid_2.ra
-        %label #{_('Choose Environment:')}
-
-      .grid_10.la
-        = environment_selector(:path_widget_class => "grid_7",
-            :path_entries_class => "grid_7", :library_clickable => true,
-            :accessible_envs => accessible_envs,
-            :url_content_views_proc => url_content_views_proc)
-
-    %fieldset
-      .grid_2.ra
-        %label #{_('Content View:')}
-
-      .grid_10.la
-        = select_tag 'update_fields[content_view_id]',
-          options_for_select(content_view_select_labels(@organization, @environment), no_content_view),
-          :id => :content_view_id
-
-    = submit_tag _('Save'), :class => 'submit dialogbutton', :id=>"save_button"
-
-= render :template => "katello/layouts/tupane_layout"
diff --git a/app/views/katello/system_groups/_list_group.html.haml b/app/views/katello/system_groups/_list_group.html.haml
deleted file mode 100644
index 378b719d6c8..00000000000
--- a/app/views/katello/system_groups/_list_group.html.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-.block.tall{:id => "#{name}_#{item.send(accessor)}", "data-ajax_url" => "#{url_for(:controller=>controller.controller_name)}/#{item.send(accessor)}", "data-ajax_panelpage" => :systems}
-  %div{:class => "column_1"}
-    %span
-      = "#{truncate(item.name, :length => 50)} (#{item.systems.count})"
diff --git a/app/views/katello/system_groups/_list_groups.html.haml b/app/views/katello/system_groups/_list_groups.html.haml
deleted file mode 100644
index 5883eea5831..00000000000
--- a/app/views/katello/system_groups/_list_groups.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-= render :partial=>"katello/system_groups/list_group", :collection=>collection, :as=>:item, :locals=>{:accessor=>accessor, :columns=>columns, :name=>name}
diff --git a/app/views/katello/system_groups/_new.html.haml b/app/views/katello/system_groups/_new.html.haml
deleted file mode 100644
index 176f313849e..00000000000
--- a/app/views/katello/system_groups/_new.html.haml
+++ /dev/null
@@ -1,50 +0,0 @@
-
-= content_for :title do
-  #{_("New System Group")}
-
-= content_for :navigation do
-  / pretty
-
-= content_for :content do
-  #system_group_new
-    = form_for @group, :html => {:method => :post}, :url => system_groups_path do |form|
-
-      %fieldset.fl.clear
-        .grid_2.ra
-          %label #{_("Name")}:
-        .grid_4.la
-          = form.text_field :name
-
-      %fieldset.fl.clear
-        .grid_2.ra
-          %label #{_("Description")}:
-        .grid_4.la
-          = form.text_area :description, :rows=>8, :maxlength => default_description_limit
-
-      %fieldset.fl.clear
-        .grid_4
-          %label #{_("System Limit")}:
-        .grid_8.la
-          - if @group.max_systems == -1
-            .grid_2.ra
-              %label #{_("Unlimited")}:
-            .grid_5.la
-              %input.unlimited_members{:type=>"checkbox", :value=>:true, :checked => :true}
-            .grid_2.ra.limit{:style => "display:none;"}
-              %label #{_("Limit")}:
-            .grid_5.la.limit{:style => "display:none;"}
-              = form.number_field :max_systems, {:size => 5, :value => "-1"}
-          - else
-            .grid_2.ra
-              %label #{_("Unlimited")}:
-            .grid_5.la
-              %input.unlimited_members{:type=>"checkbox", :value=>:true}
-            .grid_2.ra.limit
-              %label #{_("Limit")}:
-            .grid_5.la.limit
-              = form.number_field :max_systems, {:size => 5}
-
-      .grid_4.la.prefix_2
-        = button_to _("Save"), {:action => "create", :controller => "system_groups"}, :method => :post, :id => :group_save
-
-= render :template => "katello/layouts/tupane_layout"
diff --git a/app/views/katello/system_groups/_system_item.html.haml b/app/views/katello/system_groups/_system_item.html.haml
deleted file mode 100644
index a8984d33c79..00000000000
--- a/app/views/katello/system_groups/_system_item.html.haml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-%tr{'data-id' => system.system.id, :class => cycle("", "alt")}
-  %td
-    %input.system_checkbox{:type => :checkbox, :name => "systems[#{system.system.id}]", 'data-id' => system.system.id,
-                           :disabled => ('disabled' if !@group.editable?)}
-    - if Katello::System.readable(system.system.organization)
-      = link_to system.system.name, systems_path(:anchor => "/systems/#{system.system.uuid}/info")
-    - else
-      = system.system.name
-  %td
-    = system.system.environment.name
-  - if Katello.config.katello?
-    %td
-      = system.system.content_view.try(:name)
-  %td
-    = system.created_at
diff --git a/app/views/katello/system_groups/_systems.html.haml b/app/views/katello/system_groups/_systems.html.haml
deleted file mode 100644
index eb6d0f65e39..00000000000
--- a/app/views/katello/system_groups/_systems.html.haml
+++ /dev/null
@@ -1,67 +0,0 @@
-= javascript do
-  -if systems_deletable
-    :plain
-      $(document).ready(function() {
-        KT.system_groups.systems_setup(true);
-      });
-  -else
-    :plain
-      $(document).ready(function() {
-        KT.system_groups.systems_setup(false);
-      });
-
-= render :partial => "katello/system_groups/tupane_header"
-
-= content_for :content do
-  #system_group_systems.full{'data-id'=>@group.id}
-    %input#system_group_id{:name => @group.id, :type => "hidden", :value => "#{name}_#{@group.id}", "data-ajax_url"=>url_for(:action=> 'update')}
-    %form#system_form
-      -if editable
-        %table
-          %thead
-            %th
-              %span.fr.details-icon.system_content_action{"data-help" => _('This allows you to search for systems and add them to the selected system group.')}
-              #{_("Add Systems")}
-
-          %tbody
-            %tr.no_sort.not_filtered
-              %td
-                %div
-                  - help_text = _("Enter system name...")
-                  %input#add_system_input_id{:type=>'hidden'}
-                  %input{:type=>'text', :id=>'add_system_input', :size=>'30', :placeholder => help_text, :title => help_text, :tabindex => auto_tab_index}
-                  %input#add_system.button{:style => 'padding-left: 10px;', :value=>_("Add"), :type=>:button, :tabindex => auto_tab_index}
-
-      %table#systems_table.filter_table.list
-        %thead.header
-          %tr
-            %td
-              %a.view_systems.subpanel_element
-                = link_to _('View in Systems List'), systems_path(:anchor => "/systems?search=system_group:\"#{@group.name}\"")
-            %td{:colspan => 3}
-              - if Katello.config.katello?
-                %a.edit_systems.subpanel_element{"data-url" => edit_systems_system_group_path(@group.id)}
-                  = _("Edit Details for All Systems")
-          %tr
-            %th
-              = _("Name")
-            %th
-              = _("Environment")
-            - if Katello.config.katello?
-              %th
-                = _("Content View")
-            %th
-              = _("Added")
-        %tbody
-          %tr.empty_row{:class=>(:hidden if !@system_joins.empty?)}
-            %td
-              = _("No systems currently exist in this system group.")
-            %td
-          = render :partial=>'katello/system_groups/system_item', :collection=>@system_joins, :as=>:system
-
-
-= content_for :footer do
-  .full
-    %input#remove_systems.fr.button{:type=>:button, :value=>_("Remove Selected")}
-
-= render :template => "katello/layouts/tupane_layout"
diff --git a/app/views/katello/system_groups/_tupane_header.html.haml b/app/views/katello/system_groups/_tupane_header.html.haml
deleted file mode 100644
index de9b0ea2999..00000000000
--- a/app/views/katello/system_groups/_tupane_header.html.haml
+++ /dev/null
@@ -1,15 +0,0 @@
-= content_for :title do
-  #{@group.name}
-
-= content_for :remove_item do
-  .pane_actions
-    - if Katello::SystemGroup.creatable?(current_organization)
-      %a.pane_action.separator.copy-tipsy{'data-url' => copy_system_group_path(@group.id)}
-        = _('Copy')
-
-    - if @group.deletable?
-      = link_to(_("Remove"), {:action => "destroy", :controller => "system_groups", :id => @group.id},
-        {:class => "pane_action remove"})
-
-= content_for :navigation do
-  = render_subnav_menu(1..2, system_groups_navigation)
diff --git a/app/views/katello/system_groups/errata/_index.html.haml b/app/views/katello/system_groups/errata/_index.html.haml
deleted file mode 100644
index ed93ed6b208..00000000000
--- a/app/views/katello/system_groups/errata/_index.html.haml
+++ /dev/null
@@ -1,72 +0,0 @@
-= javascript 'katello/system_events'
-
-= javascript do
-  -if editable
-    :plain
-      $(document).ready(function() {
-        KT.system.errata.init(true, 'system_group');
-      });
-  -else
-    :plain
-      $(document).ready(function() {
-        KT.system.errata.init(false, 'system_group');
-      });
-
-= render :partial => "katello/system_groups/tupane_header"
-
-= content_for :header do
-  #errata_header.clear
-    %h5.fl
-      #{_("Display")}
-    %span
-      = select_tag "display_errata_type", options_for_select([[_('All Errata'), 'All'], [_('Bug Fix'), 'BugFix'], [_('Enhancement'), ('Enhancement')], [_('Security'), 'Security']])
-    -#
-      %span
-        = radio_button_tag "errata_state_radio", "outstanding", true
-        %label
-          #{_("Outstanding")}
-      %span
-        = radio_button_tag "errata_state_radio", "applied"
-        %label
-          #{_("Applied")}
-
-= content_for :content do
-  %input.events{:type => "hidden", 'data-url' => status_system_group_events_path(@group.id)}
-
-  #errata_container{ "data-parent_id" => @group.id }
-    %table.filter_table.ajaxScroll
-      %thead
-        - if editable
-          %th
-            -# = check_box_tag "select_all_errata", "select_all_errata"
-        %th
-          #{_("TYPE")}
-        %th
-          #{_("ERRATA")}
-        %th
-          #{_("TITLE")}
-        %th
-          #{_("SYSTEMS")}
-      %tbody
-        -#= render :partial => "katello/system_groups/errata/items", :locals => { :errata => errata, :editable => editable }
-    #list-spinner
-      = image_tag("katello/icons/spinner.gif", :class=>"ajax_scroll")
-
-= content_for :footer do
-  %a#load_more_errata{"data-scroll_url"=>url_for(system_group_errata_path(@group.id)), "data-page_size"=>current_user.page_size, "data-offset"=>offset, :class=>"fl", "style" => "display:none"} #{_("Load %{n} More") % {:n => offset}}
-  %span.fl{:id => 'loaded_summary', :style => 'margin-left: 20px;', 'data-total' => 0, "data-current_count" => 0 }
-    #{_("Viewing %{n} of %{t} results (%{t} Total Errata)") % {:n => 0, :t => 0 }}
-
-  - if editable
-    %span.fr
-      %button.button.disabled{:id => 'run_errata_button', 'data-url' => system_group_errata_path(@group.id) }
-        #{_('Install')}
-    .selection_group
-      %span.fr
-        %button.button{:id => 'deselect_all_button'}
-          #{_('Deselect all')}
-      %span.fr
-        %button.button{:id => 'select_all_button'}
-          #{_('Select all')}
-
-= render :template => "katello/layouts/tupane_layout"
diff --git a/app/views/katello/system_groups/events/_index.html.haml b/app/views/katello/system_groups/events/_index.html.haml
deleted file mode 100644
index 6341884134b..00000000000
--- a/app/views/katello/system_groups/events/_index.html.haml
+++ /dev/null
@@ -1,33 +0,0 @@
-= javascript "katello/system_events"
-
-= render :partial => "katello/system_groups/tupane_header"
-
-= content_for :content do
-  - if total_events_length > 0
-    %form#event_filter_form.clear
-      %input{:name => "event_search", :type => "search", :placeholder => _('Filter on Loaded Events...'), :id=>"event_search_filter",
-           'data-search_url' => items_system_group_events_path(group.id) }
-      %button.filter_button#event_filter_button #{('Filter')}
-      %br.clear
-
-    %table.filter_table.events.ajaxScroll{'data-url' => status_system_group_events_path(group.id), 'data-total_events' => total_events_length}
-      %thead
-        %th
-          %a#event_sort{"data-sort"=>"asc", :class=>"ascending"}
-            #{_("Event")}
-        %th
-          #{_("Date")}
-      %tbody#event_items
-        = render :partial => 'katello/system_groups/events/items', :locals => {:group => group, :include_tr => true}, :collection=> jobs, :as=>:job
-    #list-spinner
-      = image_tag("katello/icons/spinner.gif", :class=>"ajax_scroll")
-  - else
-    %p #{_("There are no events to display.")}
-
-= content_for :footer do
-  - if current_user.page_size < total_events_length
-    %a#more{:style => "padding-left: 20px;", "data-scroll_url"=>url_for(more_items_system_group_events_path(group.id)), "data-page_size"=>current_user.page_size, :class=>"fl"}
-  - if total_events_length > 0
-    %span{:id => 'loaded_summary', :style => "padding-left: 20px;"}
-
-= render :template => "katello/layouts/tupane_layout"
diff --git a/app/views/katello/system_groups/events/_items.html.haml b/app/views/katello/system_groups/events/_items.html.haml
deleted file mode 100644
index 1fcbbe191d7..00000000000
--- a/app/views/katello/system_groups/events/_items.html.haml
+++ /dev/null
@@ -1,29 +0,0 @@
-- if include_tr
-  - shading = cycle("", "alt")
-  <tr class = "#{shading} tasks">
-
-- job_details = job.as_json
-- job_messages = job.messages
-- job_pending = job_details[:state] == :running
-
-%td.event_name{"data-pending-job-id" => (job.id if job_pending)}
-  - if job_pending
-    = image_tag("katello/icons/spinner.gif")
-  - else
-    %span.icon_wrap.fl.status_icons
-      %span.fl{:class=>(job_details[:state] == :error ? "error_icon" : "check_icon")}
-        &nbsp;&nbsp;
-  %a.event_status.subpanel_element{"data-url"=>system_group_event_path(group.id, job.id)}
-    - if job_pending
-      = job_messages[:pending_action_message]
-    - else
-      = job_messages[:requested_action_message]
-%td.event_date
-  - if job_pending
-    = image_tag("katello/icons/spinner.gif")
-    = job_messages[:requested_action_message]
-  - else
-    = format_time(job_details[:finish_time])
-
-- if include_tr
-  </tr>
diff --git a/app/views/katello/system_groups/events/_more_items.html.haml b/app/views/katello/system_groups/events/_more_items.html.haml
deleted file mode 100644
index 5cee287aff7..00000000000
--- a/app/views/katello/system_groups/events/_more_items.html.haml
+++ /dev/null
@@ -1,3 +0,0 @@
-- if cycle_extra
-  = cycle("", "alt")
-= render :partial => 'katello/system_groups/events/items', :locals => {:group => group, :include_tr => true}, :collection=> jobs, :as=>:job
diff --git a/app/views/katello/system_groups/events/_show.html.haml b/app/views/katello/system_groups/events/_show.html.haml
deleted file mode 100644
index 766308a3fc4..00000000000
--- a/app/views/katello/system_groups/events/_show.html.haml
+++ /dev/null
@@ -1,29 +0,0 @@
-- job_details = job.as_json
-- job_messages = job.messages
-
-= content_for :title do
-  = job_messages[:task_type]
-
-= content_for :subcontent do
-  %h4
-    = format_time(job_details[:finish_time])
-
-  %fieldset
-    .grid_7
-      %h5 #{_("Summary")}
-    .grid_7.multiline
-      = job_messages[:summary_message]
-
-  %fieldset
-    .grid_7
-      %h5 #{_("Parameters")}
-    .grid_7.la
-      = job_messages[:parameters_message]
-
-  %fieldset
-    .grid_7
-      %h5 #{_("Result")}
-    .grid_7.multiline
-      = render :partial => 'katello/system_groups/events/systems', :locals => {:tasks => job.task_statuses}
-
-= render :template => "katello/layouts/tupane_layout"
diff --git a/app/views/katello/system_groups/events/_system_items.html.haml b/app/views/katello/system_groups/events/_system_items.html.haml
deleted file mode 100644
index c03dab3a447..00000000000
--- a/app/views/katello/system_groups/events/_system_items.html.haml
+++ /dev/null
@@ -1,27 +0,0 @@
-- if include_tr
-  - cssclass = cycle("alt", "")
-  <tr class = "#{cssclass}">
-
-- unless t.system.nil?
-  %td.event_name{"data-pending-task-id" => (t.id if t.pending?)}
-    - if t.pending?
-      = image_tag("katello/icons/spinner.gif")
-      = t.system.name
-
-    - else
-      %span.icon_wrap.fl.status_icons
-        %span.fl{:class=>(t.state=="error" ? "error_icon" : "check_icon")}
-          &nbsp;&nbsp;
-      .event_status
-        = t.system.name
-        %span.tipsy-icon.info.task-info{"data-result" => format_description(t.result_description)}
-
-  %td.event_date
-    - if t.pending?
-      = image_tag("katello/icons/spinner.gif")
-      = t.message
-    - else
-      = t.finish_time
-
-  - if include_tr
-    </tr>
diff --git a/app/views/katello/system_groups/events/_systems.html.haml b/app/views/katello/system_groups/events/_systems.html.haml
deleted file mode 100644
index d2d4a379a59..00000000000
--- a/app/views/katello/system_groups/events/_systems.html.haml
+++ /dev/null
@@ -1,15 +0,0 @@
-= javascript do
-  :plain
-    $(document).ready(function() {
-        KT.system_group.events.init();
-    });
-
-.grid_10
-  %table.ajaxScroll
-    %thead
-      %th
-        #{_("Event")}
-      %th
-        #{_("Date")}
-    %tbody
-      = render :partial => 'katello/system_groups/events/system_items', :locals => {:include_tr => true}, :collection=> tasks, :as=>:t
diff --git a/app/views/katello/system_groups/index.html.haml b/app/views/katello/system_groups/index.html.haml
deleted file mode 100644
index 9c5dca326c7..00000000000
--- a/app/views/katello/system_groups/index.html.haml
+++ /dev/null
@@ -1,22 +0,0 @@
-= javascript do
-  :plain
-    localize({
-      "delete_system_group_confirm": '#{escape_javascript(_('Are you sure you want to delete the system group?'))}',
-      "delete_systems_confirm": '#{escape_javascript(_('Do you also want to delete the systems in the system group?'))}',
-      "delete_systems_warning": '#{escape_javascript(_('This will completely remove those systems.'))}',
-      "delete_system_group_continue": '#{escape_javascript(_('No, only delete the system group.'))}',
-      "change_systems_confirm": '#{escape_javascript(_('Are you sure you want to change all systems in the group?'))}',
-      "edit_all_systems": '#{escape_javascript(_('Edit Details for All Systems'))}',
-      "edit_selected_systems": '#{escape_javascript(_('Edit Details for Selected Systems'))}'
-    });
-
-.grid_16
-  = help_tip_button
-  = help_tip(_("System Groups allow you to create groups consisting of multiple systems and then use those groups " + |
-               "to manage the systems.  This includes performing actions such as package and package group  " + |
-               "installations, updates and removals as well as errata installations.")) |
-
-.grid_16#main
-  = two_panel(@groups, @panel_options)
-
-= javascript 'katello/system_groups', 'katello/content_view_definitions/env_content_view_selector'
diff --git a/app/views/katello/system_groups/packages/_index.html.haml b/app/views/katello/system_groups/packages/_index.html.haml
deleted file mode 100644
index 5cad1e40aa6..00000000000
--- a/app/views/katello/system_groups/packages/_index.html.haml
+++ /dev/null
@@ -1,70 +0,0 @@
-= javascript 'katello/system_events'
-
-= javascript do
-  = render :partial => 'katello/common/package_actions_i18n'
-
-= javascript do
-  -if editable
-    :plain
-      $(document).ready(function() {
-        KT.package_actions.init(true, 'system_group');
-      });
-  -else
-    :plain
-      $(document).ready(function() {
-        KT.package_actions.init(false, 'system_group');
-      });
-
-= render :partial => "katello/system_groups/tupane_header"
-
-= content_for :content do
-  %input.events{:type => "hidden", 'data-url' => status_system_group_events_path(@group.id)}
-
-  #packages_container{ "data-parent_id" => @group.id }
-    = form_tag system_group_packages_path(@group.id), :id => "system_content_action_form", :method => "post", :remote => true do
-      %table
-        %thead
-          %th
-            %span.fr.details-icon.system_content_action{"data-help" => _('This table allows you to initiate package or package group installs, updates and removals.  Simply select either Packages or Package groups, enter a comma-separated list of names in the box provided and click either Install, Update or Remove.  Note: for any given package or package group, there may only be 1 action in progress at a time.')}
-            #{_("Manage Packages")}
-
-        %tbody
-          -if editable
-            %tr
-              %td
-                %div#content_type
-                = radio_button_tag :perform_action, :packages, true,
-                  {:class => :perform_action, :tabindex => auto_tab_index}
-                = label_tag _('Packages')
-
-                = radio_button_tag :perform_action, :package_groups, false,
-                  {:class => :perform_action, :tabindex => auto_tab_index}
-                = label_tag _('Package Groups')
-
-            %tr#error_message_container
-              %td
-                %div#error_message.validation_error_text
-
-            %tr.no_sort.not_filtered
-              %td
-                %div#content_form
-                  - help_text = _("Enter Selected Content...")
-                  %input{:type=>'text', :id=>'content_input', :size=>'30', :placeholder => help_text, :title => help_text, :tabindex => auto_tab_index}
-                  %input#add_content.button.hidden{:type=>'button', :value=>_('Install'), 'data-method'=>"POST", 'data-url'=>add_system_group_packages_path(), :tabindex => auto_tab_index}
-                  %input#update_content.button.hidden{:type=>'button', :value=>_('Update'), :'data-method'=>"POST", 'data-url'=>system_group_packages_path(), :tabindex => auto_tab_index}
-                  %input#remove_content.button.hidden{:type=>'button', :value=>_('Remove'), :'data-method'=>"POST", 'data-url'=>remove_system_group_packages_path(), :tabindex => auto_tab_index}
-                  %input#update_all_content.button{:type=>'button', :value=>_('Update All'), 'data-method'=>"POST", 'data-url'=>system_group_packages_path(), :tabindex => auto_tab_index}
-    .clear
-      &nbsp;
-
-    = form_tag system_group_packages_path(@group.id), :id => "packages_form", :method => "post", :remote => true do
-      %table.packages.ajaxScroll{'data-system_id' => @group.id}
-        %thead
-          %th{:colspan => 2}
-            %span.fr.details-icon.system_content_action{"data-help" => _('This table shows you the status of any pending package or package group actions on the system group.')}
-            %a
-              #{_("Name")}
-        %tbody
-          = render :partial => 'katello/system_groups/packages/items', :locals => {:editable => editable, :include_tr_shading => true, :group_id => @group.id}, :collection => jobs, :as => :job
-
-= render :template => "katello/layouts/tupane_layout"
diff --git a/app/views/katello/system_groups/packages/_items.html.haml b/app/views/katello/system_groups/packages/_items.html.haml
deleted file mode 100644
index c9cd3b909bd..00000000000
--- a/app/views/katello/system_groups/packages/_items.html.haml
+++ /dev/null
@@ -1,30 +0,0 @@
-- if include_tr_shading
-  - shading = cycle("", "alt")
-- else
-  - shading = ""
-
-- state = job.state
-- status_message = job.status_message
-
-- job.task_statuses.each do |task|
-
-  - if task.parameters.key?(:packages)
-    - if task.parameters[:packages].empty?
-      %tr.package{:class => "#{shading}"}
-        %td{'data-name' => "update_all_packages"}
-          #{_("All Packages")}
-        = render :partial => 'katello/system_groups/packages/status', :locals => {:group_id => group_id, :id => job.id, :state => state, :status_message => status_message}
-
-    - else
-      - task.parameters[:packages].each do |name|
-        %tr.package{:class => "#{shading}"}
-          %td{'data-name' => "#{name}"}
-            #{name}
-          = render :partial => 'katello/system_groups/packages/status', :locals => {:group_id => group_id, :id => job.id, :state => state, :status_message => status_message}
-
-  - unless task.parameters[:groups].blank?
-    - task.parameters[:groups].each do |name|
-      %tr.group{:class => "#{shading}"}
-        %td{'data-name' => "#{name}"}
-          #{name}
-        = render :partial => 'katello/system_groups/packages/status', :locals => {:group_id => group_id, :id => job.id, :state => state, :status_message => status_message}
diff --git a/app/views/katello/system_groups/packages/_status.html.haml b/app/views/katello/system_groups/packages/_status.html.haml
deleted file mode 100644
index 0fe3f9abbc9..00000000000
--- a/app/views/katello/system_groups/packages/_status.html.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-%td.fr.status{'data-pending-action-id' => (id if state == :running)}
-  - if state == :running
-    = image_tag("katello/icons/spinner.gif")
-  %a.event_status.subpanel_element{"data-url"=>system_group_event_path(group_id, id)}
-    = status_message
diff --git a/app/views/katello/system_packages/_package_items.html.haml b/app/views/katello/system_packages/_package_items.html.haml
deleted file mode 100644
index 15b394a6b01..00000000000
--- a/app/views/katello/system_packages/_package_items.html.haml
+++ /dev/null
@@ -1,43 +0,0 @@
--# This view contains several lines that are commented (i.e. -#) out on purpose... They may be uncommented when package
--# updates are supported.
-
-- unless package_tasks.nil?
-  - package_tasks.each do |t|
-
-    -# the task's 'parameters' may have a list of names... so process them individually...
-    - unless t.parameters.nil? or t.parameters[:packages].nil?
-      - t.parameters[:packages].each do |pkg_name|
-
-        %tr{:class => row_shading + ' content_package', 'data-pending-action-id' => t.id}
-          %td
-          %td.package_name
-            #{pkg_name}
-          %td.package_action_status
-            = image_tag("icons/spinner.gif")
-            = get_status_string(t.task_type)
-
-- unless group_tasks.nil?
-  - group_tasks.each do |t|
-
-    -# the task's 'parameters' may have a list of names... so process them individually...
-    - unless t.parameters.nil? or t.parameters[:groups].nil?
-      - t.parameters[:groups].each do |group_name|
-
-        %tr{:class => row_shading + ' content_group', 'data-pending-action-id' => t.id}
-          %td
-          %td.package_name
-            #{group_name}
-          %td.package_action_status
-            = image_tag("icons/spinner.gif")
-            = get_status_string(t.task_type)
-
--packages.each_with_index do |p,index|
-
-  %tr{:class => 'package', :style => "#{index < offset ? ' ' : 'display:none;' }" }
-    - if editable
-      %td.package_select
-        = check_box_tag "package[#{p.name}]", "0", false, {:tabindex => auto_tab_index}
-    -#%td.package_status.packages_icon
-    %td.package_name
-      #{p.nvrea}
-    %td.package_action_status
diff --git a/app/views/katello/system_packages/_packages.html.haml b/app/views/katello/system_packages/_packages.html.haml
deleted file mode 100644
index 96e84b818e1..00000000000
--- a/app/views/katello/system_packages/_packages.html.haml
+++ /dev/null
@@ -1,132 +0,0 @@
--# This view contains several lines that are commented (i.e. -#) out on purpose... They may be uncommented when package
--# updates are supported.
-
-= javascript do
-  :plain
-    localize({
-      "adding_package"            : '#{adding_package}',
-      "adding_package_success"    : '#{escape_javascript(_('Add Package Complete'))}',
-      "adding_package_failed"     : '#{escape_javascript(_('Add Package Error'))}',
-      "adding_package_canceled"   : '#{escape_javascript(_('Add Package Canceled'))}',
-      "adding_package_timeout"    : '#{escape_javascript(_('Add Package Timeout'))}',
-
-      "updating_package"          : '#{updating_package}',
-      "updating_package_success"  : '#{escape_javascript(_('Update Package Complete'))}',
-      "updating_package_failed"   : '#{escape_javascript(_('Update Package Error'))}',
-      "updating_package_canceled" : '#{escape_javascript(_('Update Package Canceled'))}',
-      "updating_package_timeout"  : '#{escape_javascript(_('Update Package Timeout'))}',
-
-      "removing_package"          : '#{removing_package}',
-      "removing_package_success"  : '#{escape_javascript(_('Remove Package Complete'))}',
-      "removing_package_failed"   : '#{escape_javascript(_('Remove Package Error'))}',
-      "removing_package_canceled" : '#{escape_javascript(_('Remove Package Canceled'))}',
-      "removing_package_timeout"  : '#{escape_javascript(_('Remove Package Timeout'))}',
-
-      "adding_group"              : '#{adding_package_group}',
-      "adding_group_success"      : '#{escape_javascript(_('Add Package Group Complete'))}',
-      "adding_group_failed"       : '#{escape_javascript(_('Add Package Group Error'))}',
-      "adding_group_canceled"     : '#{escape_javascript(_('Add Package Group Canceled'))}',
-      "adding_group_timeout"      : '#{escape_javascript(_('Add Package Group Timeout'))}',
-
-      "removing_group"            : '#{removing_package_group}',
-      "removing_group_success"    : '#{escape_javascript(_('Remove Package Group Complete'))}',
-      "removing_group_failed"     : '#{escape_javascript(_('Remove Package Group Error'))}',
-      "removing_group_canceled"   : '#{escape_javascript(_('Remove Package Group Canceled'))}',
-      "removing_group_timeout"    : '#{escape_javascript(_('Remove Package Group Timeout'))}',
-
-      "validation_error_name_format" : '#{escape_javascript(_('One or more package names are invalid.'))}',
-      "validation_error_package_pending" : '#{escape_javascript(_('One or more of the packages provided has an action pending.'))}',
-      "validation_error_group_pending" : '#{escape_javascript(_('One or more of the groups provided has an action pending.'))}',
-
-      "x_of_y_packages" : function(x,y){ return '#{escape_javascript(_("(Loaded %X of %Y Total)"))}'.replace("%X", x).replace("%Y", y); }
-      });
-
-= javascript :system_packages
-
-= render :partial => "katello/systems/system_tupane_header_nav"
-
-= content_for :content do
-
-  -#.grid_8.summary
-    -#.summary_top
-      -#.packages_icon
-      -#.fl
-        -#= image_tag("boxshadow.png")
-      -#.summary_text.fl #{_("All Packages are up-to-date.")}
-
-  - if packages.length > 0
-
-    .grid_8
-      = form_tag system_system_packages_path(@system.id), :id => "system_content_action_form", :method => "post", :remote => true do
-        %table
-          %thead
-            %th
-              %span.fr.details-icon.system_content_action{"data-help" => _('This table allows you to initiate package or package group installs and removals.  Simply select either Packages or Package groups, enter a comma-separated list of names in the box provided and click either +Add or -Remove.')}
-              #{_("Manage Packages")}
-
-          %tbody
-            -if editable
-              %tr
-                %td
-                  %div#content_type
-                  = radio_button_tag :perform_action, :packages, true, :tabindex => auto_tab_index
-                  = label_tag _('Packages')
-                  = radio_button_tag :perform_action, :package_groups, false, :tabindex => auto_tab_index
-                  = label_tag _('Package Groups')
-
-              %tr#error_message_container
-                %td
-                  %div#error_message.validation_error_text
-
-              %tr.no_sort.not_filtered
-                %td
-                  %div#content_form
-                    - help_text = _("Enter Selected Content...")
-                    %input{:type=>'text', :id=>'content_input', :size=>'30', :placeholder => help_text, :title => help_text, :tabindex => auto_tab_index}
-                    %a#add_content.disabled{:style => 'padding-left: 10px;', :tabindex => auto_tab_index} #{_('+ Add')}
-                    %a#remove_content.disabled{:style => 'padding-left: 10px;', :tabindex => auto_tab_index} #{_('- Remove')}
-
-    .clear
-      &nbsp;
-
-    .grid_8
-      = render :partial => "common/filter_table", :locals => {:filter_placeholder => _('Filter on all packages...')}
-      = form_tag system_system_packages_path(@system.id), :id => "packages_form", :method => "post", :remote => true do
-        %table.filter_table.packages.ajaxScroll{'data-system_id' => @system.id, 'data-total_packages' => total_packages}
-          %thead
-            %th{:colspan => 3}
-              %span.fr.details-icon.system_content_action{"data-help" => _('This table allows you to initiate package updates or removals as well as update all packages.  In order to update or remove packages, simply select the packages you are interested in and click Update or Remove.  In order to update all packages, click Update All when no packages are selected.')}
-              %a#package_sort{"data-sort"=>"asc", :class=>"ascending"}
-                #{_("Name")}
-            -#%th
-              -##{_("Date Added")}
-          %tbody
-            = render :partial => 'package_items', :locals => {:editable => editable,
-                                                              :package_tasks => package_tasks,
-                                                              :group_tasks => group_tasks,
-                                                              :packages => packages,
-                                                              :offset => offset}
-
-      #list-spinner
-        = image_tag("icons/spinner.gif", :class=>"ajax_scroll")
-
-  - else
-    %p #{_("There are no packages to display.")}
-
-= content_for :footer do
-  - if packages.length > 0
-    .grid_8
-      %a#more{:style => "padding-left: 20px;",
-          "data-scroll_url"=>url_for(more_packages_system_system_packages_path(@system.id)),
-          "data-page_size"=>current_user.page_size, "data-offset"=>offset,
-          :class=>"fl", :tabindex => auto_tab_index} #{_("Load %{n} More") % {:n => offset}}
-      %span{:id => 'loaded_summary', :style => "padding-left: 20px;"}
-        -##{"%{n} Loaded of %{t} Total" % {:n => offset, :t => total_packages}}
-
-      - if editable
-        .prefix_2.grid_6.ra
-          = submit_tag _("Update All"), :class => 'button', :id => 'update_all_packages', 'data-url' => system_system_packages_path(@system.id), :tabindex => auto_tab_index
-          = submit_tag _("Update"), :class => 'button', :id => 'update_packages', 'data-url' => system_system_packages_path(@system.id), :tabindex => auto_tab_index
-          = submit_tag _('Remove'), :class => 'button', :id => 'remove_packages', 'data-url' => remove_system_system_packages_path(@system.id), :tabindex => auto_tab_index
-
-= render :template => "katello/layouts/tupane_layout"
diff --git a/app/views/katello/systems/_actions.html.haml b/app/views/katello/systems/_actions.html.haml
deleted file mode 100644
index a534c849c3a..00000000000
--- a/app/views/katello/systems/_actions.html.haml
+++ /dev/null
@@ -1,96 +0,0 @@
-= javascript do
-  :plain
-    localize({
-      "validation_error_pkg_name_format" : '#{escape_javascript(_('One or more package names are invalid.'))}',
-      "validation_error_pkg_list_empty" : '#{escape_javascript(_('At least one name must be provided.'))}',
-      "validation_error_pkg_group_list_empty" : '#{escape_javascript(_('At least one package group name must be provided.'))}',
-      "validation_error_errata_list_empty" : '#{escape_javascript(_('At least one erratum ID must be provided.'))}',
-      "validation_error_select_content_type" : '#{escape_javascript(_('Please select Package(s) or Package Group(s).'))}',
-      "validation_error_system_group_empty" : '#{escape_javascript(_('At least one system group must be selected.'))}',
-
-      "confirm_system_remove_action" : function(x){ return '#{escape_javascript(_("Are you sure you want to delete the %X selected system(s)?"))}'.replace("%X", x); },
-      "confirm_package_action" : function(x,y,z){ return '#{escape_javascript(_("Are you sure you want to %X the %Y entered on the %Z selected system(s)?"))}'.replace("%X", x).replace("%Y", y).replace("%Z", z); },
-      "confirm_errata_action" : function(x){ return '#{escape_javascript(_("Are you sure you want to install the errata entered on the %X selected system(s)?"))}'.replace("%X", x); },
-
-      "confirm_system_group_add_action" : function(x){ return '#{escape_javascript(_("Are you sure you want to add the %X selected system(s) to the system group(s) entered?"))}'.replace("%X", x); },
-      "confirm_system_group_remove_action" : function(x){ return '#{escape_javascript(_("Are you sure you want to remove the %X selected system(s) from the system group(s) entered?"))}'.replace("%X", x); },
-      "auto_attach_all_systems_success" : '#{escape_javascript(_("Successfully completed 'auto-attach all systems' action"))}',
-      "auto_attach_all_systems_failure" : '#{escape_javascript(_("An error occured during the 'auto-attach all systems' action"))}'
-    });
-
-%h4
-  #{_('List Actions')}:
-
-.panel_action{:class=>"disabled", 'data-id'=>"remove_systems", 'data-url'=>bulk_destroy_systems_path(), 'data-method'=>"DELETE"}
-  .delete_icon.fl
-  %a.request_action
-    #{_("Remove System(s)")}
-  .options
-    %div.confirmation_text
-    .actions
-      %input.cancel.button{:type=>"button", :value=>_('No')}
-      %input.trigger.button{:type=>"button", :value=>_('Yes') }
-    %br.clearfloat
-
-- if Katello.config.katello?
-  .panel_action{:class=>"disabled", 'data-id'=>"systems_package_action"}
-    .package_icon.fl
-    = radio_button_tag :systems_action, :packages, false, :disabled => 'disabled'
-    = label_tag _('Package')
-    = radio_button_tag :systems_action, :package_groups, false, :disabled => 'disabled'
-    = label_tag _('Package Group')
-    %div
-      - help_text = _("Enter Package or Group Name(s)...")
-      %input{:type=>'text', :id=>'packages_input', :disabled => 'disabled', :size=>'25', :placeholder => help_text, :title => help_text}
-      %input.request_action.package.button{:type=>'button', :value=>_('Install'), :disabled => 'disabled', 'data-method'=>"POST", 'data-url'=>bulk_content_install_systems_path()}
-      %input.request_action.package.button{:type=>'button', :value=>_('Update'), :disabled => 'disabled', 'data-method'=>"POST", 'data-url'=>bulk_content_update_systems_path()}
-      %input.request_action.package.button{:type=>'button', :value=>_('Remove'), :disabled => 'disabled', 'data-method'=>"POST", 'data-url'=>bulk_content_remove_systems_path()}
-
-    %div.validation_error
-    .options
-      %div.confirmation_text
-      .actions
-        %input.cancel.button{:type=>"button", :value=>_('No')}
-        %input.trigger.button{:type=>"button", :value=>_('Yes') }
-      %br.clearfloat
-
-- if Katello.config.katello?
-  .panel_action{:class=>"disabled", 'data-id'=>"systems_errata_action", 'data-url'=>bulk_errata_install_systems_path(), 'data-method'=>"POST"}
-    .erratum_icon.fl
-    %label
-      #{_("Errata")}
-    %div
-      - help_text = _("Enter Errata...")
-      %input{:type=>'text', :id=>'errata_input', :disabled => 'disabled', :size=>'25', :placeholder => help_text, :title => help_text}
-      %input.request_action.errata.button{:type=>'button', :value=>_('Install'), :disabled => 'disabled'}
-    %div.validation_error
-    .options
-      %div.confirmation_text
-      .actions
-        %input.cancel.button{:type=>"button", :value=>_('No')}
-        %input.trigger.button{:type=>"button", :value=>_('Yes') }
-      %br.clearfloat
-
-- if Katello.config.katello?
-  .panel_action{:class=>"disabled", 'data-id'=>"systems_system_groups_action"}
-    .system_group_icon.fl
-    %label
-      #{_("System Groups")}
-    %div
-      = select_tag 'bulk_system[system_group_id]', options_from_collection_for_select(@system_groups, :id, :name), :multiple => true
-      %input.request_action.system_group.button{:type=>'button', :value=>_('Add'), :disabled => 'disabled', 'data-method'=>"POST", 'data-url'=>bulk_add_system_group_systems_path(), 'data-action'=>'add_group'}
-      %input.request_action.system_group.button{:type=>'button', :value=>_('Remove'), :disabled => 'disabled', 'data-method'=>"POST", 'data-url'=>bulk_remove_system_group_systems_path(), 'data-action'=>'remove_group'}
-    %div.validation_error
-    .options
-      %div.confirmation_text
-      .actions
-        %input.cancel.button{:type=>"button", :value=>_('No')}
-        %input.trigger.button{:type=>"button", :value=>_('Yes') }
-      %br.clearfloat
-
-.panel_action{'data-id' => 'auto_attach_all_systems_action'}
-  %input.btn#auto_attach_all_button{ :value => _("Auto-attach available subscriptions to all systems"), :type => "button", :data => { :url => api_organization_auto_attach_all_systems_path(current_organization.label), :method => "post", :taskstate => @auto_attach_task.try(:state), :taskuuid => @auto_attach_task.try(:uuid) } }
-
-.panel_action{'data-id'=>"select_none"}
-  #select-result
-  %a#select-none #{_("Select None")}
diff --git a/app/views/katello/systems/_edit.html.haml b/app/views/katello/systems/_edit.html.haml
deleted file mode 100644
index 35286f993df..00000000000
--- a/app/views/katello/systems/_edit.html.haml
+++ /dev/null
@@ -1,229 +0,0 @@
-= javascript do
-  :plain
-    KT.current_environment_id = #{system.environment_id};
-    KT.available_environments = $.parseJSON('#{escape_javascript(environments.to_json)}');
-    KT.current_content_view_id = #{system.content_view_id || -1};
-    KT.available_content_views = $.parseJSON('#{escape_javascript(system.environment.content_views.readable(current_organization).to_json)}');
-
-    localize({
-        "systemReleaseVerDefault": '#{escape_javascript(_("System Default"))}',
-        "contentViewReset": 'The selected content view was unset. Please choose another one.'
-    });
-
-= javascript 'widgets/jquery.jeditable.helpers', 'systems/system_edit'
-= render :partial => "system_tupane_header_nav"
-
-= content_for :content do
-  #system
-    %form.form
-      %input#panel_element_id{:name => @system.id, :type => "hidden", :value => "#{name}_#{system.id.to_s}", "data-ajax_url"=>url_for(:action=> 'update')}
-        %h5 #{_("Basic Information")}
-        .control-group
-          .label
-            = label :id, :id, _("ID")
-          .input
-            .value
-              = system.id
-        .control-group
-          .label
-            = label :id, :id, _("UUID")
-          .input
-            .value
-              = system.uuid
-        %h5 #{_("Subscription Status Details")}
-        .control-group
-          .label
-            = label :reason, :reason, _('Subscription Status')
-          .input
-            .product
-              .status_icon{:class => "#{system.compliance_color}"}
-            .value
-              = system_status_message(system)
-        .control-group
-          .label
-            =label :details, :details, _("Details")
-          .input
-            %span.value
-              %table#details_table
-                - system.compliance['reasons'].each do |reason|
-                  %tr
-                    %td.interface_name
-                      = reason['attributes']['name']
-                    %td.interface_addr
-                      = reason['message']
-        %h5 #{_("Networking")}
-        .control-group
-          .label
-            = label :hostname, :hostname, _("Hostname")
-          .input
-            %span.value
-              = system.hostname
-        .control-group
-          .label
-            = label :interfaces, :interfaces, _("Interfaces")
-          .input
-            %span.value
-              %table#details_table
-                - system.interfaces.each do |interface|
-                  %tr
-                    %td.interface_name
-                      = interface[:name]
-                    %td.interface_addr
-                      = interface[:addr]
-
-        %h5 #{_("System Properties")}
-        .control-group
-          .label
-            = label :system, :name, _("Name")
-          .input
-            %span.value{'name' => 'system[name]', :class=>("editable edit_panel_element" if editable), 'data-url'=>system_path(system.id)} #{system[:name]}
-        .control-group
-          .label
-            = label :system, :description, _("Description")
-          .input
-            %span.value{'name' => 'system[description]', :class=>("editable edit_textarea" if editable), 'data-maxlength' => default_description_limit, 'data-url'=>system_path(system.id)} #{system[:description]}
-        .control-group
-          .label
-            = label :os, :os, _("OS")
-          .input
-            %span.value
-              = system.distribution_name
-        .control-group
-          .label
-            = label :release, :release, _("Release")
-          .input
-            %span.value
-              = system.kernel
-        .control-group
-          .label
-            - help_message = _("Setting the release version limits content to this version only, preventing newer packages from being available for installation.")
-            %span.tipsify.details_icon-grey{:title => help_message}
-            = label :releaseVer, :releaseVer, _("Release Version")
-          .input
-            - if !releases_error.nil?
-              %span.value{'name' => 'system[releaseVer]', 'class' => ("editable edit_select_system_releasever_message error_message" if editable), 'data-url'=>system_path(system.id), 'data-message'=>releases_error}
-                = system.release == "" ? _("System Default") : system.release
-            - elsif releases == []
-              - if Katello.config.katello?
-                - none_message = ("No alternate release version choices are available. These choices are based upon the repositories that have been enabled and promoted to this system's environment.")
-              - else
-                - none_message = _("No alternate release version choices are available. These choices are based upon the Red Hat manifest imported and the content available in the CDN.")
-              %span.value{'name' => 'system[releaseVer]', 'class' => ("editable edit_select_system_releasever_message" if editable), 'data-url'=>system_path(system.id), 'data-message'=>none_message}
-                = system.release == "" ? _("System Default") : system.release
-            - elsif releases.nil?
-              %span.value{'name' => 'system[releaseVer]', 'class' => ("editable edit_select_system_releasever" if editable), 'data-url' => system_path(system.id), 'data-loadurl' => releases_system_path(system.id, {:ui=>true}), 'data-options' => system_releasevers_edit(system, [])}
-                = system.release
-            - else
-              %span.value{'name' => 'system[releaseVer]', 'class' => ("editable edit_select_system_releasever" if editable), 'data-url' => system_path(system.id), 'data-options' => system_releasevers_edit(system, releases)}
-                = system.release
-        .control-group
-          .label
-            = label :arch, :arch, _("Arch")
-          .input
-            %span.value
-              = System.architectures[system.arch]
-        .control-group
-          .label
-            = label :memory, :memory, _("RAM (GB)")
-          .input
-            %span.value
-              = system.memory
-        .control-group
-          .label
-            = label :sockets, :sockets, _("Sockets")
-          .input
-            %span.value
-              = system.sockets
-        .control-group
-          .label
-            = label :location, :location, _("Location")
-          .input
-            %span.value{'name' => 'system[location]', :class=>("editable edit_textfield" if editable), 'data-url'=>system_path(system.id)} #{system[:location]}
-
-        - if Katello.config.katello?
-          %h5 #{_("Content Available From")}
-          .control-group
-            .label
-              = label :arch, :arch, _("Environment")
-            .input
-              %span.value#environment_path_selector{'data-name'=> 'system[environment_id]'}
-          .control-group
-            .label
-              = label :content_view, :content_view, _("Content View")
-            .input
-              %span.value#content_view_selector{'data-name' => 'system[content_view_id]', 'data-options' => system_content_view_opts(system)}
-          .control-group#env_content_view_selector_buttons{'data-url'=>system_path(system.id)}
-
-        %h5 #{_("System Events")}
-        .control-group
-          .label
-            = label :checked_in, :checked_in, _("Checked In")
-          .input
-            %span.value
-              = get_checkin(system)
-        .control-group
-          .label
-            = label :registered_date, :registered_date, _("Registered")
-          .input
-            %span.value
-              = convert_time(system.created)
-        .control-group
-          .label
-            = label :last_booted, :last_booted, _("Last Booted")
-          .input
-            %span.value
-              = _("None")
-        .control-group
-          .label
-            = label :host_guest, :activation_key, _("Activation Key")
-          .input
-            %span.value
-              - if @system.activation_keys.blank?
-                = _("None")
-              - else
-                - @system.activation_keys.each do |key|
-                  %table#details_table
-                    %tr
-                      %td
-                        = activation_key_link_helper(key)
-
-        %h5 #{_("Host & Guest Info")}
-        .control-group
-          .label
-            = label :host_guest, :host_type, _("System Type")
-          .input
-            %span.value
-              = system_type(system)
-
-        .control-group
-          - if system.guest
-            .label
-              = label :host_guest, :host, _("Host")
-            .input
-              %span.value
-                - if system.host
-                  - if system.host.id
-                    = link_to(system.host.attributes['name'],
-                                        systems_path(:anchor => "/!=&panel=system_#{system.host.id}"))
-                  - else
-                    = system.host.attributes['name']
-                - else
-                  = _("Unknown")
-          -else
-            .label
-              = label :host_guest, :guest, _("Guests")
-            .input
-              %span.value
-                - if system.guests.length < 1
-                  = _("None")
-                - else
-                  %ul
-                  - system.guests.each do |guest|
-                    %li{:style=>'list-style: none;'}
-                      - if guest.id
-                        = link_to(guest.attributes['name'],
-                                  systems_path(:anchor => "/!=&panel=system_#{guest.id}"))
-                      - else
-                        = guest.attributes['name']
-
-= render :template => "layouts/tupane_layout"
diff --git a/app/views/katello/systems/_edit_custom_info.html.haml b/app/views/katello/systems/_edit_custom_info.html.haml
deleted file mode 100644
index 240f708e97c..00000000000
--- a/app/views/katello/systems/_edit_custom_info.html.haml
+++ /dev/null
@@ -1,10 +0,0 @@
-= javascript 'widgets/jquery.jeditable.helpers', 'systems/system_edit'
-
-= render :partial => "systems/system_tupane_header_nav"
-
-= render :partial => "custom_info/edit",
-         :locals => { :informable => @system,
-                      :informable_type => "system",
-                      :informable_id => @system.id }
-
-= render :template => "layouts/tupane_layout"
diff --git a/app/views/katello/systems/_facts.html.haml b/app/views/katello/systems/_facts.html.haml
deleted file mode 100644
index 06ca44bee84..00000000000
--- a/app/views/katello/systems/_facts.html.haml
+++ /dev/null
@@ -1,33 +0,0 @@
-:javascript
-  $('td').click(function(){
-    $('.scroll-pane').jScrollPane().data('jsp').reinitialise();
-  });
-
-= render :partial => "system_tupane_header_nav"
-
-= content_for :content do
-  #facts
-    %table#factsTable.scroll-panel
-      %thead
-        %th= _("Group")
-        %th= _("Fact")
-        %th= _("Value")
-      %tbody
-        - group = nil
-        - @system.facts.sort.each do |fact, value|
-          - new_group = fact.split(".", 2)[0]
-          - if (new_group != group)
-            - group = new_group
-            %tr{:id => group}
-              %td= new_group
-              %td
-              %td
-          %tr{:class => "child-of-#{group}", :id => fact}
-            %td
-            %td= fact
-            %td= value
-    :javascript
-      $("#factsTable").treeTable({initialState: "collapsed", clickableNodeNames: true});
-      $('.scroll-pane').jScrollPane().data('jsp').reinitialise();
-
-= render :template => "layouts/tupane_layout"
diff --git a/app/views/katello/systems/_hypervisor.html.haml b/app/views/katello/systems/_hypervisor.html.haml
deleted file mode 100644
index 7cb44897ae0..00000000000
--- a/app/views/katello/systems/_hypervisor.html.haml
+++ /dev/null
@@ -1,7 +0,0 @@
-= render :partial => "systems/system_tupane_header_nav"
-
-= content_for :content do
-  %p
-    = message
-
-= render :template => "layouts/tupane_layout"
diff --git a/app/views/katello/systems/_list_system.html.haml b/app/views/katello/systems/_list_system.html.haml
deleted file mode 100644
index 11bad00e068..00000000000
--- a/app/views/katello/systems/_list_system.html.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-.block.tall{:id => "#{name}_#{item.send(accessor)}", "data-ajax_url" => "#{url_for(:controller=>controller.controller_name)}/#{item.send(accessor)}", "data-ajax_panelpage" => @panel_options[:initial_action]}
-  = render :partial=>"systems/list_system_show", :locals=>{:item => item}
diff --git a/app/views/katello/systems/_list_system_show.html.haml b/app/views/katello/systems/_list_system_show.html.haml
deleted file mode 100644
index bbb83e879ea..00000000000
--- a/app/views/katello/systems/_list_system_show.html.haml
+++ /dev/null
@@ -1,25 +0,0 @@
-%div{:id => "system_#{item.id}"}
-  %div{:class => 'column_2'}
-    .product
-      .status_icon{:class => "#{item.send('compliance_color')}"}
-    %ul
-      %li
-        %div.one-line-ellipsis#heading_title
-          %span#name
-            = item.send('name')
-      - if Katello.config.katello?
-        %li.one-line-ellipsis
-          = _('Env: ')
-          %span#environment
-            = system_environment_name item
-      %li.one-line-ellipsis
-        = _('OS: ')
-        %span#environment
-          = item.send('distribution_name')
-  %div{:class => 'column_2'}
-    %ul
-      %li
-        = get_registered(item)
-      %li
-        = get_checkin(item)
-.arrow-right
diff --git a/app/views/katello/systems/_list_systems.html.haml b/app/views/katello/systems/_list_systems.html.haml
deleted file mode 100644
index c5549a4958d..00000000000
--- a/app/views/katello/systems/_list_systems.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-= render :partial=>"systems/list_system", :collection=>collection, :as=>:item, :locals=>{:accessor=>accessor, :columns=>columns, :name=>name}
diff --git a/app/views/katello/systems/_more_products.html.haml b/app/views/katello/systems/_more_products.html.haml
deleted file mode 100644
index 3e868d3c585..00000000000
--- a/app/views/katello/systems/_more_products.html.haml
+++ /dev/null
@@ -1,9 +0,0 @@
--products.each do |p|
-  %tr
-    %td{:class=>'product grid_12'}
-      %ul
-        %li
-          .status_icon{:class => "#{@system.product_compliance_color p['productId']}"}
-          = "#{p['productName']} #{p['version']}"
-        %li
-          = system_subscription_status_message(@system, p)
diff --git a/app/views/katello/systems/_new.html.haml b/app/views/katello/systems/_new.html.haml
deleted file mode 100644
index 985270e50ad..00000000000
--- a/app/views/katello/systems/_new.html.haml
+++ /dev/null
@@ -1,20 +0,0 @@
-= content_for :title do
-  #{_("Register System")}
-= content_for :content do
-  %section.instruction-page
-    %p
-      #{_("To register a system to this server, run the following commands within a console on the client system.")}
-    .clear
-      &nbsp
-    %p
-      #{_("Install the pre-built bootstrap RPM. This will configure the system to use this server.")}
-    %pre
-      %code
-        = install_cert_command
-    %p
-      #{_("Use Subscription Manager to register.")}
-    %pre
-      %code
-        = register_command
-
-= render :template => "layouts/tupane_layout"
diff --git a/app/views/katello/systems/_products.html.haml b/app/views/katello/systems/_products.html.haml
deleted file mode 100644
index 36b9f447ca9..00000000000
--- a/app/views/katello/systems/_products.html.haml
+++ /dev/null
@@ -1,23 +0,0 @@
-= javascript 'widgets/filtertable', 'systems/system_products'
-
-= render :partial => "system_tupane_header_nav"
-
-= content_for :content do
-  - if products.length > 0
-    = render :partial => "katello/common/filter_table"
-    %table.filter_table.products.ajaxScroll
-      %thead
-        %th
-          %a#products_sort{"data-sort"=>"asc", :class=>"ascending"}
-            #{_("Product")} (#{products_count})
-      %tbody
-        = render :partial => 'more_products', :locals => {:products => products}
-
-    - if products.length == current_user.page_size
-      %a#products_more{"data-scroll_url"=>url_for(more_products_system_path()), "data-page_size"=>current_user.page_size, "data-offset"=>offset, "data-products_count"=>products_count, :class=>"fl"} #{_("More...")}
-      #list-spinner
-        = image_tag("icons/spinner.gif", :class=>"ajax_scroll")
-  - else
-    %p #{_("There are no products to display.")}
-
-= render :template => "katello/layouts/tupane_layout"
diff --git a/app/views/katello/systems/_subs.html.haml b/app/views/katello/systems/_subs.html.haml
deleted file mode 100644
index 10dff443c21..00000000000
--- a/app/views/katello/systems/_subs.html.haml
+++ /dev/null
@@ -1,144 +0,0 @@
-= javascript_include_tag "widgets/treetable"
-
-%div
-  %h5
-    = form_tag system_path(@system), :id=>"autoheal_form", :method=>"put", :remote=>true do
-      #{_("System Current Subscription(s)")}
-  = form_tag update_subscriptions_system_path, :id=>"unsubscribe", :method=>"post", :remote=>true do
-    = hidden_field_tag "subscribe_action", "unsubscribe"
-    .tree
-      %table#unsubscribeTable
-        %thead
-          %tr
-            %th
-            %th #{_("Subscription")}
-            %th #{_("SLA")}
-            %th #{_("Contract")}
-            %th #{_("Quantity")}
-            %th #{_("Start")}
-            %th #{_("End")}
-        %tbody
-          - if consumed_entitlements.length > 0
-            - for entitlement in consumed_entitlements
-              - cycle_class = cycle("", "alt")
-              %tr{:id => "#{entitlement.entitlementId}", :class => cycle_class}
-                %td{:style => "padding-top:9px;"}
-                %td{:style => "padding-top:9px;", :colspan => '5'}
-                  - if editable
-                    %span.fl= check_box_tag "subscription[#{entitlement.entitlementId}]", value="#{entitlement.entitlementId}", false
-                  &nbsp;
-                  = subscriptions_pool_link_helper(entitlement.poolName, entitlement.poolId, entitlement.provider_id, current_organization)
-                %td{:style => "padding-top:9px;"}
-                  - if entitlement.provider_id == current_organization.redhat_provider.id
-                    #{_('Red Hat Product')}
-                  - else
-                    #{_('Custom Content Repository Product')}
-              %tr{:id => "#{entitlement.entitlementId}-row2", :class => cycle_class}
-                %td{:style => "padding-top:9px;"}
-                %td{:style => "padding-top:9px;"}
-                %td{:style => "padding-top:9px;"} #{entitlement.sla}
-                %td{:style => "padding-top:9px;"} #{entitlement.contractNumber}
-                %td{:style => "padding-top:9px;"}
-                  = entitlement.quantity < 0 ? 1 : entitlement.quantity
-                %td{:style => "padding-top:9px;"} #{format_time entitlement.startDate}
-                %td{:style => "padding-top:9px;"} #{format_time entitlement.endDate}
-              - entitlement.providedProducts.each do |product|
-                %tr{:class => "child-of-#{entitlement.entitlementId} " + cycle_class}
-                  %td{:colspan=>7}
-                    %ul
-                      %li
-                        = _("Product Name: ")
-                        = product.name
-          - else
-            %tr
-              %td{:colspan=>7} #{_("There are currently no subscriptions attached to the system")}
-      - if editable && consumed_entitlements.length > 0
-        .actions
-          %a{:class=>'dialogbutton button disabled', :id=>"fake_unsub_submit"} #{_('Remove')}
-          = submit_tag _('Remove'), :class => 'update_subscriptions submit dialogbutton', :id=>"unsub_submit"
-%br
-%div
-  %h5
-    #{_("Available Subscriptions")}
-  = form_tag update_preference_user_path(current_user), :id=>"matchsystem_form", :method=>"put", :remote=>false do
-    = select_tag 'subscription_filters', subscription_filters.html_safe, :multiple => true, "data-placeholder" => _("Subscription Filter Options"), :disabled => true
-  = form_tag update_subscriptions_system_path, :id=>"subscribe", :method=>"post", :remote=>true do
-    = hidden_field_tag "subscribe_action", "subscribe"
-    %div.hidden#available_spinner
-      %table
-        %thead
-          %tr
-            %th
-            %th #{_("Subscription")}
-            %th #{_("SLA")}
-            %th #{_("Limits")}
-            %th #{_("Quantity")}
-            %th #{_("Start")}
-            %th #{_("End")}
-        %tbody
-          %tr
-            %td{:colspan=>7}
-              .spinner{:style=>"margin-top:20px;"}
-    %div#available_section
-      .tree
-        %table#subscribeTable
-          %thead
-            %tr
-              %th
-              %th #{_("Subscription")}
-              %th #{_("SLA")}
-              %th #{_("Limits")}
-              %th #{_("Quantity")}
-              %th #{_("Start")}
-              %th #{_("End")}
-          %tbody
-            - if avail_subs.length > 0
-              - reset_cycle()  # Always start table with a light colored line
-              - for sub in avail_subs
-                - cycle_class = cycle("", "alt")
-                %tr{:id => "#{sub.cp_id}", :class => cycle_class}
-                  %td{:style => "padding-top:9px;"}
-                  %td{:style => "padding-top:9px;", :colspan => '5'}
-                    - if editable
-                      %span.fl= check_box_tag "subscription[#{sub.cp_id}]", false
-                    &nbsp;
-                    = subscriptions_pool_link_helper(sub.product_name, sub.cp_id, sub.provider_id, current_organization)
-                  %td{:style => "padding-top:9px;"}
-                    - if sub.provider_id == current_organization.redhat_provider.id
-                      #{_('Red Hat Product')}
-                    - else
-                      #{_('Custom Content Repository Product')}
-                %tr{:id => "#{sub.cp_id}-row2", :class => cycle_class}
-                  %td{:style => "padding-top:9px;"}
-                  %td{:style => "padding-top:9px;"}
-                  %td{:style => "padding-top:9px;"} #{sub.support_level}
-                  %td{:style => "padding-top:9px;"}
-                    = subscription_limits_helper(sub)
-                  - if sub.multi_entitlement
-                    %td
-                      = text_field_tag "spinner[#{sub.cp_id}]", nil, :min => 0, :max => (sub.quantity - sub.consumed), :step => (sub.instance_multiplier ? sub.instance_multiplier : 1), :value => 0, :class => "ui-spinner", 'data-suggested' => sub.suggested_quantity
-                      %span{:style => "padding-top:9px;"}
-                        = "of #{sub.quantity - sub.consumed}"
-                  - else
-                    %td{:style => "padding-top:9px;"}
-                      - if sub.quantity < 0
-                        = _("Unlimited")
-                      -else
-                        %div{:id => "spinner_label_#{sub.cp_id}", :class => "ui-nonspinner-label"} 0 of #{sub.quantity - sub.consumed}
-                      = hidden_field_tag "spinner[#{sub.cp_id}]", 0, :class => "ui-nonspinner", 'data-suggested' => sub.suggested_quantity
-                  %td{:style => "padding-top:9px;"} #{format_time sub.start_date}
-                  %td{:style => "padding-top:9px;"} #{format_time sub.end_date}
-                - sub.provided_products.each do |product|
-                  %tr{:class => "child-of-#{sub.cp_id} " + cycle_class}
-                    %td{:colspan=>7}
-                      %ul
-                        %li
-                          = _("Product Name: ")
-                          = product['productName']
-            - else
-              %tr
-                %td{:colspan=>7} #{_("There are no more subscriptions available.")}
-        - if editable && avail_subs.length > 0
-          .actions
-            = submit_tag _('Attach'), :class => 'submit dialogbutton', :id=>"sub_submit"
-            %a{:class=>'dialogbutton button disabled', :id=>"fake_sub_submit"} #{_('Attach')}
diff --git a/app/views/katello/systems/_subs_update.js.haml b/app/views/katello/systems/_subs_update.js.haml
deleted file mode 100644
index 338187fdd4f..00000000000
--- a/app/views/katello/systems/_subs_update.js.haml
+++ /dev/null
@@ -1 +0,0 @@
-!= "KT.panel.panelAjax('', '#{escape_javascript(subscriptions_system_path)}' ,$('#panel'));"
\ No newline at end of file
diff --git a/app/views/katello/systems/_subscription_details.html.haml b/app/views/katello/systems/_subscription_details.html.haml
deleted file mode 100644
index 2861fe145c2..00000000000
--- a/app/views/katello/systems/_subscription_details.html.haml
+++ /dev/null
@@ -1,23 +0,0 @@
-%li
-  %hr{:width=>"75%"}
-%li
-  = _('GPG Key URL: ')
-  - product_content.content.gpgUrl.split(',').each do |link|
-    - if link == 'http://'
-      = _("None")
-    - else
-      %a{:href => "#{link}"}
-        = link
-%li
-  -# TODO: This content url needs to get the source prefix (http:...) from somewhere
-  - link = product_content.content.contentUrl
-  = _('Content Download URL: ')
-  -# %a{:href => "#{link}"}
-  -#  = link
-  = link
-%li
-  = _('Repo Type: ')
-  = product_content.content.type
-%li
-  = _('Enabled by Default: ')
-  = product_content.enabled
diff --git a/app/views/katello/systems/_subscriptions.html.haml b/app/views/katello/systems/_subscriptions.html.haml
deleted file mode 100644
index 2f6854ad13c..00000000000
--- a/app/views/katello/systems/_subscriptions.html.haml
+++ /dev/null
@@ -1,28 +0,0 @@
-= javascript do
-  :plain
-    localize({
-        "systemSelectAutoheal": '#{escape_javascript(_("Select Auto-attach Level..."))}',
-        "runAutoAttachSuccess": '#{escape_javascript(_("Successfully auto-attached system"))}',
-        "runAutoAttachFail": '#{escape_javascript(_("Failed to auto-attach system"))}'
-    });
-= javascript 'widgets/jquery.jeditable.helpers', 'systems/system_subscriptions'
-
-= render :partial => "system_tupane_header_nav"
-
-= content_for :content do
-  .subs
-    .subs_top
-      .subs_image_wrapper
-        .subs_image{:class => "#{@system.compliance_color}"}
-      .subs_text.fl.panel_link
-        = system_status_message(@system)
-        = link_to(_('Details'), edit_system_path(@system))
-      %input.fr.button#heal_system_button{:type => "button", :value => _("Run Auto-Attach"), :data => { :url => refresh_subscriptions_api_system_path(@system.uuid), :method => "post" }}
-    .subs_servicelevel{'name' => 'system[serviceLevel]', 'class' => ("editable edit_select_system_servicelevel" if editable), 'data-url' => system_path(system.id), 'data-options' => system_servicelevel_edit(system)}
-      = system_servicelevel(system)
-    .clear
-  #subs_data
-    = render :partial => "subs", :locals => {:system => @system, :avail_subs => avail_subs, :consumed_entitlements => consumed_entitlements, :editable => editable, :subscription_filters => subscription_filters}
-  %br.clear
-
-= render :template => "layouts/tupane_layout"
diff --git a/app/views/katello/systems/_system_group_items.html.haml b/app/views/katello/systems/_system_group_items.html.haml
deleted file mode 100644
index 3187dae8427..00000000000
--- a/app/views/katello/systems/_system_group_items.html.haml
+++ /dev/null
@@ -1,7 +0,0 @@
-- system_groups.each do |system_group|
-  %tr
-    %td
-      -if @system.editable?
-        %input.group_select{:type=>"checkbox", :id=>system_group.name, :name=>system_group.name, :value=>system_group.id}
-      %label{:for=>system_group.name}
-        = system_group.name
diff --git a/app/views/katello/systems/_system_groups.html.haml b/app/views/katello/systems/_system_groups.html.haml
deleted file mode 100644
index 88fbd031880..00000000000
--- a/app/views/katello/systems/_system_groups.html.haml
+++ /dev/null
@@ -1,26 +0,0 @@
-= render :partial => "system_tupane_header_nav"
-
-= content_for(:content) do
-  #system_groups
-    %table
-      %thead
-        %tr.no_sort
-          %th
-            #{_("Name")}
-
-      -if editable
-        %tr#add_groups.no_sort
-          %td
-            %form{:id=>'add_group_form'}
-              = select_tag :system_group, options_from_collection_for_select(@system_groups, :id, :name), :multiple => true
-              %input.button{:type=>'submit', :id=>'add_groups', :value=>_('Add'), 'data-url'=> add_system_groups_system_path(@system)}
-
-        %tr#empty_row{:class=>(:hidden if !@system.system_groups.empty?)}
-          %td
-            = _("This system is not currently associated with a System Group.")
-        = render :partial=>'system_group_items', :locals=>{:system_groups=>@system.system_groups}
-
-    - if @system.editable?
-      %input.fr.button{:type=>"button", :id=>"remove_groups", :value=>_("Remove"), 'data-url'=> remove_system_groups_system_path(@system)}
-
-= render :template => "layouts/tupane_layout"
diff --git a/app/views/katello/systems/_system_tupane_header_nav.html.haml b/app/views/katello/systems/_system_tupane_header_nav.html.haml
deleted file mode 100644
index 7e206c06dc6..00000000000
--- a/app/views/katello/systems/_system_tupane_header_nav.html.haml
+++ /dev/null
@@ -1,10 +0,0 @@
-= content_for :title do
-  #{@system.name}
-
-= content_for :remove_item do
-  -if @system.deletable?
-    = link_to _("Remove System"), { :controller => "systems", :action => "destroy", :id => @system.id }, :confirm => _('Are you sure you want to remove this system?'), :method => :delete, :class=>"remove_item", :remote=>true
-
-
-= content_for :navigation do
-  = render_subnav_menu(1..2, systems_navigation)
diff --git a/app/views/katello/systems/errata/_index.html.haml b/app/views/katello/systems/errata/_index.html.haml
deleted file mode 100644
index 283d135b0ef..00000000000
--- a/app/views/katello/systems/errata/_index.html.haml
+++ /dev/null
@@ -1,62 +0,0 @@
-= javascript 'katello/widgets/filtertable'
-= javascript do
-  -if editable
-    :plain
-      $(document).ready(function() {
-        KT.system.errata.init(true, 'system');
-      });
-  -else
-    :plain
-      $(document).ready(function() {
-        KT.system.errata.init(false, 'system');
-      });
-
-= render :partial => "katello/systems/system_tupane_header_nav"
-
-= content_for :header do
-  #errata_header.clear
-    %h5.fl
-      #{_("Display")}
-    %span
-      = select_tag "display_errata_type", options_for_select([[_('All Errata'), 'All'], [_('Bug Fix'), 'BugFix'], [_('Enhancement'), ('Enhancement')], [_('Security'), 'Security']])
-    -#
-      %span
-        = radio_button_tag "errata_state_radio", "outstanding", true
-        %label
-          #{_("Outstanding")}
-      %span
-        = radio_button_tag "errata_state_radio", "applied"
-        %label
-          #{_("Applied")}
-
-= content_for :content do
-  #errata_container{ "data-parent_id" => @system.id }
-    %table.filter_table.ajaxScroll
-      %thead
-        - if editable
-          %th
-            -# = check_box_tag "select_all_errata", "select_all_errata"
-        %th
-          #{_("TYPE")}
-        %th
-          #{_("ERRATA")}
-        %th
-          #{_("TITLE")}
-        %th
-          #{_("DETAILS")}
-      %tbody
-        -#= render :partial => "systems/errata/items", :locals => { :errata => errata, :editable => editable }
-    #list-spinner
-      = image_tag("icons/spinner.gif", :class=>"ajax_scroll")
-
-= content_for :footer do
-  %a#load_more_errata{"data-scroll_url"=>url_for(system_errata_path(@system.id)), "data-page_size"=>current_user.page_size, "data-offset"=>offset, :class=>"fl", "style" => "display:none"} #{_("Load %{n} More") % {:n => offset}}
-  %span.fl{:id => 'loaded_summary', :style => 'margin-left: 20px;', 'data-total' => 0, "data-current_count" => 0 }
-    #{_("Viewing %{n} of %{t} results (%{t} Total Errata)") % {:n => 0, :t => 0 }}
-
-  - if editable
-    %span.fr
-      %button.button.disabled{:id => 'run_errata_button', 'data-url' => system_errata_path(@system.id) }
-        #{_('Install')}
-
-= render :template => "katello/layouts/tupane_layout"
diff --git a/app/views/katello/systems/errata/_items.html.haml b/app/views/katello/systems/errata/_items.html.haml
deleted file mode 100644
index f3fbae79df1..00000000000
--- a/app/views/katello/systems/errata/_items.html.haml
+++ /dev/null
@@ -1,21 +0,0 @@
--errata.each do |e|
-  %tr{ :id => "errata_#{e.errata_id}" }
-    - if editable
-      %td
-        = check_box_tag "errata_checkbox", e.errata_id
-    %td
-      %div{:class=>errata_type_class(e)}
-    %td.one-line-ellipsis
-      %a{:href => content_search_errata_link(e.errata_id)}
-        = e.errata_id
-    %td
-      %span.one-line-ellipsis.grid_4{ "title" => e.title }
-        = e.title
-      %span.errata_status.fr.hidden
-        = image_tag("icons/spinner.gif")
-        %span.errata_status_text
-          #{_('Installing')}
-    - if e.applicable_consumers.present?
-      %td{:style => "text-align:center;"}
-        %span.tipsy-icon.systems{"data-list" => e.applicable_consumers.collect{|i| i[:name]}.to_json}
-          = e.applicable_consumers.length
diff --git a/app/views/katello/systems/index.html.haml b/app/views/katello/systems/index.html.haml
deleted file mode 100644
index a2df9cfeec2..00000000000
--- a/app/views/katello/systems/index.html.haml
+++ /dev/null
@@ -1,46 +0,0 @@
-= javascript do
-  :plain
-    localize({
-      "select_system_groups" : '#{escape_javascript(_('Select System Groups.'))}',
-      "group_does_not_exist" : '#{escape_javascript(_('System Group does not exist.  Would you like to create it?'))}',
-      "confirm_create" : '#{escape_javascript(_('+ Yes'))}'
-      });
-
-= javascript
--# Add env selector and Set the flag appropriately to indicate if there is one
--if defined? envsys
-  -if envsys == true
-    = javascript do
-      :plain
-        $(document).ready(function() {
-            env_select.envsys = true
-        });
-  -else
-    = javascript do
-      :plain
-        $(document).ready(function() {
-            env_select.envsys = false
-        });
-  .grid_16.center
-    = environment_selector(:library_clickable => true, :accessible_envs => accessible_envs, :url_proc => lambda {|a| environments_systems_path(:env_id => a[:environment].id )})
--else
-  = javascript do
-    :plain
-      $(document).ready(function() {
-          env_select.envsys = false
-      });
-
-.grid_16#main
-  = two_panel(@systems, @panel_options)
-
-= javascript :systems
-
--if defined? envsys
-  = javascript do
-    :plain
-      $(document).ready(function() {
-          env_select.env_changed_callback('#{@environment.id}');
-          env_select.click_callback = function(env_id) {
-              $.bbq.pushState({env_id : env_id});
-          };
-      });
diff --git a/app/views/katello/systems/new_nutupane.html.haml b/app/views/katello/systems/new_nutupane.html.haml
deleted file mode 100644
index 1444841fc1f..00000000000
--- a/app/views/katello/systems/new_nutupane.html.haml
+++ /dev/null
@@ -1,52 +0,0 @@
-= javascript do
-  :plain
-    localize({
-      "edit_environment": '#{escape_javascript(_('Edit Environment'))}'
-    });
-
-:ruby
-  sockets_help = _("The number of CPU Sockets or LPARs which this system uses")
-  memory_help = _("The amount of RAM memory, in gigabytes (GB), which this system has")
-
-
-- if @environment
-  %h2
-    #{_("New system")}
-  %section
-    .full
-      = kt_form_for(System.new, :action => "create", :id => "new_system") do |form|
-        = hidden_field_tag 'system[environment_id]', @environment.id
-        .grid_8#new_system
-          = form.text_field :name, :label => _("Name of Your System:")
-
-          = form.field :arch, :label => _("Architecture:") do
-            = architecture_select
-
-          = form.text_field :sockets, :label => _("Number of Sockets or LPARs:"), :note => sockets_help, :value => 1
-
-          = form.text_field :memory, :label => _("Amount of RAM (GB):"), :note => memory_help, :value => ''
-
-          = form.field :virtual, :label => _("System Type:") do
-            = virtual_buttons
-
-          = form.field :environment, :label => envsys ? _("Environment:") : _("Choose Environment:") do
-            - if envsys
-              = @environment.name
-            - else
-              = environment_selector(:path_widget_class => "grid_10",
-                  :path_entries_class => "grid_10", :library_clickable => true,
-                  :accessible_envs => accessible_envs,
-                  :url_products_proc => url_products_proc,
-                  :url_content_views_proc => url_content_views_proc)
-
-          - if Katello.config.katello?
-            = form.field :content_view_id, :label => _("Content View:") do
-              = content_view_select(current_organization, @environment)
-
-
-          = form.submit _("Save")
-- else
-  = content_for :title do
-    #{_("New system")}
-    = content_for :content do
-      #{_("You need to create an environment for this org before you can create a system.")}
diff --git a/app/views/katello/systems/show_nutupane.html.haml b/app/views/katello/systems/show_nutupane.html.haml
deleted file mode 100644
index 23d61a46495..00000000000
--- a/app/views/katello/systems/show_nutupane.html.haml
+++ /dev/null
@@ -1,199 +0,0 @@
-= javascript do
-  :plain
-    $(function(){
-      KT.available_environments = $.parseJSON('#{escape_javascript(environments.to_json)}');
-      localize({
-          "systemReleaseVerDefault": '#{escape_javascript(_("System Default"))}'
-      });
-    });
-
-= javascript 'widgets/jquery.jeditable.helpers', 'systems/system_edit'
-
-%div
-  %header
-    %h2.fl
-      = system.name
-  %section{ "ng-controller" => "SystemController", "style" => "clear:both;" }
-    %nav{ 'alch-menu' => "systems_menu" }
-    %form.form
-      %input#panel_element_id{:name => @system.id, :type => "hidden", :value => "#{name}_#{system.id.to_s}", "data-ajax_url"=>url_for(:action=> 'update')}
-
-      %h5 #{_("Basic Information")}
-      .control-group
-        .label
-          = label :id, :id, _("ID")
-        .input
-          %span.value
-            = system.id
-      .control-group
-        .label
-          = label :id, :id, _("UUID")
-        .input
-          %span.value
-            = system.uuid
-
-      %h5 #{_("Networking")}
-      .control-group
-        .label
-          = label :hostname, :hostname, _("Hostname")
-        .input
-          %span.value
-            = system.hostname
-      .control-group
-        .label
-          = label :interfaces, :interfaces, _("Interfaces")
-        .input
-          %table#interface_table
-            - system.interfaces.each do |interface|
-              %tr
-                %td.interface_name
-                  = interface[:name]
-                %td.interface_addr
-                  = interface[:addr]
-
-      %h5 #{_("System Properties")}
-      .control-group
-        .label
-          = label :system, :name, _("Name")
-        .input
-          %span.value{'name' => 'system[name]', :class=>("editable edit_panel_element" if editable), 'data-url'=>system_path(system.id)}
-            = system[:name]
-      .control-group
-        .label
-          = label :system, :description, _("Description")
-        .input
-          %span.value{'name' => 'system[description]', :class=>("editable edit_textarea" if editable), 'data-maxlength' => default_description_limit, 'data-url'=>system_path(system.id)}
-            = system[:description]
-      .control-group
-        .label
-          = label :os, :os, _("OS")
-        .input
-          %span.value
-            = system.distribution_name
-      .control-group
-        .label
-          = label :release, :release, _("Release")
-        .input
-          %span.value
-            = system.kernel
-      .control-group
-        .label
-          - help_message = _("Setting the release version limits content to this version only, preventing newer packages from being available for installation.")
-          %span.tipsify.details_icon-grey{:title => help_message}
-          = label :releaseVer, :releaseVer, _("Release Version")
-        .input
-          - if !releases_error.nil?
-            %span.value{'name' => 'system[releaseVer]', 'class' => ("editable edit_select_system_releasever_message error_message" if editable), 'data-url'=>system_path(system.id), 'data-message'=>releases_error}
-              = system.release == "" ? _("System Default") : system.release
-          - elsif releases == []
-            - if Katello.config.katello?
-              - none_message = ("No alternate release version choices are available. These choices are based upon the repositories that have been enabled and promoted to this system's environment.")
-            - else
-              - none_message = _("No alternate release version choices are available. These choices are based upon the Red Hat manifest imported and the content available in the CDN.")
-            %span.value{'name' => 'system[releaseVer]', 'class' => ("editable edit_select_system_releasever_message" if editable), 'data-url'=>system_path(system.id), 'data-message'=>none_message}
-              = system.release == "" ? _("System Default") : system.release
-          - else
-            %span.value{'name' => 'system[releaseVer]', 'class' => ("editable edit_select_system_releasever" if editable), 'data-url' => system_path(system.id), 'data-options' => system_releasevers_edit(system, releases)}
-              = system.release
-      .control-group
-        .label
-          = label :arch, :arch, _("Arch")
-        .input
-          %span.value
-            = System.architectures[system.arch]
-      .control-group
-        .label
-          = label :memory, :memory, _("RAM (GB)")
-        .input
-          %span.value
-            = system.memory
-      .control-group
-        .label
-          = label :sockets, :sockets, _("Sockets")
-        .input
-          %span.value
-            = system.sockets
-      .control-group
-        .label
-          = label :location, :location, _("Location")
-        .input
-          %span.value{'name' => 'system[location]', :class=>("editable edit_textfield" if editable), 'data-url'=>system_path(system.id)}
-            = system[:location]
-      .control-group
-        .label
-          = label :arch, :arch, _("Environment")
-        .input
-          %span.value
-            #environment_path_selector{'name'=> 'system[environment_id]', :class=>("editable" if editable), 'data-url'=>system_path(system.id)}
-            %span #{system_environment_name system}
-      - if Katello.config.katello?
-        .control_group
-          .label
-            = label :content_view, :content_view, _("Content View")
-          .input
-            %span.value{'name' => 'system[content_view_id]', :class=>("editable edit_select" if editable), 'data-url'=>system_path(system.id), 'data-options' => system_content_view_opts}
-              = system.content_view
-
-      %h5 #{_("System Events")}
-      .control-group
-        .label
-          = label :checked_in, :checked_in, _("Checked In")
-        .input
-          %span.value
-            = get_checkin(system)
-      .control-group
-        .label
-          = label :registered_date, :registered_date, _("Registered")
-        .input
-          %span.value
-            = convert_time(system.created)
-      .control-group
-        .label
-          = label :last_booted, :last_booted, _("Last Booted")
-        .input
-          %span.value
-            = _("None")
-      .control-group
-        .label
-          = label :host_guest, :activation_key, _("Activation Key")
-        .input
-          %span.value
-            - if @system.activation_keys.blank?
-              = _("None")
-            - else
-              - @system.activation_keys.each do |key|
-                %table#interface_table
-                  %tr
-                    %td
-                      - if ActivationKey.readable? key.organization
-                        = link_to key.name, activation_keys_path(:anchor => "/!=&panel=activation_key_#{key.id}")
-                      - else
-                        = key[:name]
-
-      %h5 #{_("Host & Guest Info")}
-      .control-group
-        .label
-          = label :host_guest, :host_type, _("System Type")
-        .input
-          %span.value
-            = system_type(system)
-
-      .control-group
-        - if system.guest
-          .label
-            = label :host_guest, :host, _("Host")
-          .input
-            %span.value
-              = system.host ? system.host.attributes['name'] : _("Unknown")
-        -else
-          .label
-            = label :host_guest, :guest, _("Guests")
-          .input
-            %span.value
-              - if system.guests.length < 1
-                = _("None")
-              - else
-                %ul
-                - system.guests.each do |guest|
-                  %li{:style=>'list-style: none;'}
-                    = guest.attributes['name']
diff --git a/config/routes.rb b/config/routes.rb
index 52e40c4e3d3..415f2776b35 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -4,39 +4,6 @@
     collection do
       get :items
       get :all
-      get :auto_complete
-      get :validate_name
-    end
-    member do
-      post :copy
-      get :systems
-      post :add_systems
-      post :remove_systems
-      delete :destroy_systems
-      get :edit_systems
-      put :update_systems
-    end
-    resources :events, :controller => "system_group_events", :only => [:index, :show] do
-      collection do
-        get :status, action: :event_status
-        get :more_items
-        get :items
-      end
-    end
-    resources :packages, :controller => "system_group_packages", :only => [:index] do
-      collection do
-        put :add
-        put :remove
-        put :update
-        get :status, action: :package_status
-      end
-    end
-    resources :errata, :controller => "system_group_errata", :only => [:index] do
-      collection do
-        get :items
-        post :install
-        get :status, action: :errata_status
-      end
     end
   end
 
@@ -151,21 +118,10 @@
   match 'notices' => 'notices#show', :via => :get
   match 'notices' => 'notices#destroy_all', :via => :delete
 
-  resources :subscriptions do
-    member do
-      get :edit
-      get :products
-      get :consumers
-    end
+  resources :subscriptions, :only => [:index] do
     collection do
       get :all
-      get :items
-      post :upload
-      post :delete_manifest
-      post :refresh_manifest
-      get :history
-      get :history_items
-      get :edit_manifest
+      get :index
     end
   end
 
@@ -184,60 +140,12 @@
     end
   end
 
-  resources :systems do
-    resources :events, :only => [:index, :show], :controller => "system_events" do
-      collection do
-        get :status, action: :event_status
-        get :more_events
-        get :items
-      end
-    end
-    resources :system_packages, :only => {} do
-      collection do
-        put :add
-        post :remove
-        post :update
-        get :packages
-        get :more_packages
-        get :status, action: :package_status
-      end
-    end
-    resources :errata, :controller => "system_errata", :only => [:index, :update] do
-      collection do
-        get :items
-        post :install
-        get :status, action: :errata_status
-      end
-    end
-
-    member do
-      get :edit
-      get :subscriptions
-      post :update_subscriptions
-      get :products
-      get :more_products
-      get :facts
-      get :system_groups
-      put :add_system_groups
-      put :remove_system_groups
-      get :custom_info
-      get :releases
-    end
+  resources :systems, :only => [:index] do
     collection do
-      get :auto_complete
-      get :items
-      get :env_items
-      get :environments
       get :all
-      delete :bulk_destroy
-      post :bulk_add_system_group
-      post :bulk_remove_system_group
-      post :bulk_content_install
-      post :bulk_content_update
-      post :bulk_content_remove
-      post :bulk_errata_install
     end
   end
+
   resources :operations, :only => [:index]  do
   end
 
@@ -256,16 +164,6 @@
     end
   end
 
-  resources :errata, :only => [:show] do
-    collection do
-      get :auto_complete
-    end
-    member do
-      get :packages
-      get :short_details
-    end
-  end
-
   resources :puppet_modules, :only => [:show] do
     collection do
       get :auto_complete
@@ -300,15 +198,11 @@
     end
   end
 
-  resources :products, :only => [:index, :new, :create, :edit, :update, :destroy] do
+  resources :products, :only => [:index] do
     collection do
       get :auto_complete
       get :all
     end
-    member do
-      put :refresh_content
-      put :disable_content
-    end
   end
 
   resources :users do
@@ -481,7 +375,5 @@
 
   match '/user_session/set_org' => 'user_sessions#set_org', :via => :post
 
-  match '/i18n/dictionary' => 'i18n#show', :via => :get
-
   match 'about', :to => "application_info#about", :as => "about"
 end
diff --git a/lib/katello/tasks/test.rake b/lib/katello/tasks/test.rake
index 701af8e8f7b..318d28391fd 100644
--- a/lib/katello/tasks/test.rake
+++ b/lib/katello/tasks/test.rake
@@ -47,9 +47,6 @@ namespace :test do
           "#{Katello::Engine.root}/test/controllers/content_views_controller_test.rb",
           "#{Katello::Engine.root}/test/controllers/filter_rules_controller_test.rb",
           "#{Katello::Engine.root}/test/controllers/filters_controller_test.rb",
-          "#{Katello::Engine.root}/test/controllers/products_controller_test.rb",
-          "#{Katello::Engine.root}/test/controllers/providers_controller_test.rb",
-          "#{Katello::Engine.root}/test/controllers/systems_controller_test.rb",
           "#{Katello::Engine.root}/test/lib/repo_discovery_test.rb",
           "#{Katello::Engine.root}/test/models/authorization/*_test.rb",
           "#{Katello::Engine.root}/test/models/association_test.rb",
diff --git a/spec/controllers/organizations_controller_spec.rb b/spec/controllers/organizations_controller_spec.rb
deleted file mode 100644
index d90900e2e90..00000000000
--- a/spec/controllers/organizations_controller_spec.rb
+++ /dev/null
@@ -1,298 +0,0 @@
-#
-# Copyright 2013 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
-require 'katello_test_helper'
-
-module Katello
-describe OrganizationsController do
-
-  include LocaleHelperMethods
-  include OrganizationHelperMethods
-  include AuthorizationHelperMethods
-
-  module OrgControllerTest
-    ORG_ID = 1
-    ORGANIZATION = {:organization => {:name => "organization_name", :label => "organization_name",:description => "organization_description"},
-                    :environment => {:description=>"foo", :label => "foo",:name => "organization_env"}}
-    ORGANIZATION_UPDATE = {:description => "organization_description"}
-  end
-
-  before (:each) do
-    setup_controller_defaults
-    @controller.stubs(:search_validate).returns(true)
-  end
-
-  describe "rules" do
-    before (:each) do
-      @org1 = new_test_org
-      @organization = new_test_org
-    end
-    describe "GET index" do
-      let(:action) {:items}
-      let(:req) { get :items }
-      let(:authorized_user) do
-        user_with_permissions { |u| u.can(:read, :organizations,nil, @organization) }
-      end
-      let(:unauthorized_user) do
-        user_without_permissions
-      end
-
-      it_should_behave_like "protected action"
-    end
-
-    describe "update org put" do
-      before do
-        @organization.stubs(:update_attributes!).returns(OrgControllerTest::ORGANIZATION[:organization])
-        @organization.stubs(:name).returns(OrgControllerTest::ORGANIZATION[:organization][:name])
-        Organization.stubs(:find_by_label).returns(@organization)
-      end
-      let(:action) {:update}
-      let(:req) do
-        put 'update', :id => @organization.id, :organization => OrgControllerTest::ORGANIZATION_UPDATE
-      end
-      let(:authorized_user) do
-        user_with_permissions { |u| u.can(:update, :organizations,nil, @organization) }
-      end
-      let(:unauthorized_user) do
-        user_without_permissions
-      end
-      it_should_behave_like "protected action"
-    end
-  end
-
-  describe "create a root org" do
-    describe 'with valid parameters' do
-      before (:each) do
-        # for these tests we need full user
-
-        @organization = new_test_org #controller.current_organization
-        @controller.stubs(:current_organization).returns(@organization)
-      end
-
-      it 'should create organization (katello)' do #TODO headpin
-        post 'create', OrgControllerTest::ORGANIZATION
-        must_respond_with(:success)
-        assigns[:organization].name.must_equal OrgControllerTest::ORGANIZATION[:organization][:name]
-      end
-
-      it 'should create organization and account for spaces (katello)' do #TODO headpin
-        post 'create', {:organization => {:name => "multi word organization",:label=> "multi-word-organization",
-          :description => "spaced out organization"}, :environment => {:name => "first-env", :label => "first-env"}}
-        must_respond_with(:success)
-        assigns[:organization].name.must_equal "multi word organization"
-        assigns[:organization].label.must_equal "multi-word-organization"
-      end
-
-      it 'should generate a success notice' do
-        must_notify_with(:success)
-        post 'create', OrgControllerTest::ORGANIZATION
-        must_respond_with(:success)
-      end
-    end
-
-    describe 'with invalid paramaters' do
-      it 'should generate an error notice' do
-        must_notify_with(:error)
-        post 'create', { :name => "", :description => "" }
-        response.must_respond_with(400)
-      end
-
-      it 'should generate an error notice for a bad label' do
-        must_notify_with(:exception)
-        post 'create', {:organization => { :name => "ACME", :label => "bad\n<label>" }}
-        response.must_respond_with(422)
-      end
-
-      let(:req) do
-        bad_req           = { :organization => { :name    => "multi word organization", :description => "spaced out organization",
-                                                 :envname => "first-env" } }
-        bad_req[:bad_foo] = "mwahaha"
-        post :create, bad_req
-      end
-
-      it_should_behave_like "bad request"
-    end
-
-  end
-
-  describe "get a listing of organizations" do
-    before (:each) do
-     new_test_org
-    end
-
-    it 'should call katello organization find api' do
-      get :index
-      must_respond_with(:success)
-      must_render_template("index")
-    end
-
-    it 'should allow for an offset' do
-      @controller.stubs(:render)
-      @controller.expects(:render_panel_direct)
-      get 'items', :offset=> "5"
-      must_respond_with(:success)
-    end
-  end
-
-  describe "delete an organization" do
-
-    describe "with no exceptions thrown" do
-      before (:each) do
-        @controller.stubs(:render).returns("") #fix for not finding partial
-        @org = new_test_org
-        @org.stubs(:name).returns(OrgControllerTest::ORGANIZATION[:name])
-        Organization.stubs(:find_by_label).returns(@org)
-        new_test_org
-      end
-
-      it 'should call katello organization destroy api if there are more than 1 organizations (katello)' do #TODO headpin
-        Organization.stubs(:count).returns(2)
-        OrganizationDestroyer.expects(:destroy).with(@org, :notify => true).once.returns(true)
-        delete 'destroy', :id => @org.id
-        must_respond_with(:success)
-      end
-
-      it "should generate a success notice" do
-        Organization.stubs(:count).returns(2)
-        OrganizationDestroyer.expects(:destroy).with(@org, :notify => true).once.returns(true)
-        must_notify_with(:success)
-        delete 'destroy', :id => @org.id
-        must_respond_with(:success)
-      end
-
-      it "should be successful (katello)" do #TODO headpin
-        Organization.stubs(:count).returns(2)
-        delete 'destroy', :id => @org.id
-        must_respond_with(:success)
-      end
-    end
-
-    describe "with exceptions thrown" do
-      before (:each) do
-        new_test_org
-        Organization.stubs(:find_by_label).returns(@organization)
-      end
-      it "should generate an errors notice" do
-        must_notify_with(:error)
-        delete 'destroy', :id => @organization.id
-        response.must_respond_with(400)
-      end
-    end
-
-    describe "exception is thrown in katello api" do
-      before (:each) do
-        @organization = new_test_org
-        @organization.stubs(:destroy).raises(StandardError)
-        Organization.stubs(:find_by_label).returns(@organization)
-      end
-
-      it "should generate an error notice" do
-        must_notify_with(:error)
-        delete 'destroy', :id =>  OrgControllerTest::ORG_ID
-        response.must_respond_with(400)
-      end
-
-      it "should redirect to show view (katello)" do #TODO headpin
-        delete 'destroy', :id =>  OrgControllerTest::ORG_ID
-        response.must_respond_with(400)
-      end
-    end
-  end
-
-  describe "update a organization" do
-
-    describe "with no exceptions thrown" do
-
-      before (:each) do
-        @organization = new_test_org
-        @organization.stubs(:save!).returns(true)
-        @organization.stubs(:update_attributes!).returns(OrgControllerTest::ORGANIZATION[:organization])
-        @organization.stubs(:name).returns(OrgControllerTest::ORGANIZATION[:organization][:name])
-        Organization.stubs(:find_by_label).returns(@organization)
-      end
-
-      it "should call katello org update api (katello)" do #TODO headpin
-        @organization.expects(:save!).once
-        put 'update', :id => OrgControllerTest::ORG_ID, :organization => OrgControllerTest::ORGANIZATION_UPDATE
-        must_respond_with(:success)
-      end
-
-      it "should generate a success notice" do
-        must_notify_with(:success)
-        put 'update', :id => OrgControllerTest::ORG_ID, :organization => OrgControllerTest::ORGANIZATION_UPDATE
-      end
-
-      it "should not redirect from edit view (katello)" do #TODO headpin
-        put 'update', :id => OrgControllerTest::ORG_ID, :organization => OrgControllerTest::ORGANIZATION_UPDATE
-        response.must_respond_with(:success)
-      end
-    end
-    describe "with invalid params" do
-      before do
-        @organization = new_test_org
-      end
-
-      let(:req) do
-        bad_req = {:id => @organization.label, :organization => {:desc =>"grand" }}
-        put :update, bad_req
-      end
-
-      it_should_behave_like "bad request"
-    end
-
-    describe "exception is thrown in katello api" do
-      before(:each) do
-        @organization = new_test_org
-        @organization.stubs(:update).raises(StandardError)
-        Organization.stubs(:find_by_label).returns(@organization)
-      end
-
-      it "should generate an error notice" do
-        must_notify_with(:error)
-        put 'update', :id => OrgControllerTest::ORG_ID
-      end
-
-      it "should not redirect from edit view (katello)" do #TODO headpin
-        put 'update', :id => OrgControllerTest::ORG_ID
-        must_respond_with(400)
-      end
-    end
-  end
-
-  describe "Debug Certificates related test" do
-    before (:each) do
-      new_test_org
-    end
-    it "should download" do
-      Resources::Candlepin::Owner.expects(:get_ueber_cert).once.returns(:cert => "uber",:key=>"ueber")
-      get :download_debug_certificate, :id => @organization.id.to_s
-      must_respond_with(:success)
-    end
-
-  end
-
-  describe "default_info" do
-
-    before(:each) do
-      @organization = new_test_org
-      Organization.stubs(:find_by_label).returns(@organization)
-    end
-
-    it "should render template" do
-      get :default_info, :id => @organization.id.to_s, :informable_type => "system"
-      must_respond_with(:success)
-      must_render_template("default_info")
-    end
-
-  end
-end
-end
diff --git a/spec/controllers/products_controller_spec.rb b/spec/controllers/products_controller_spec.rb
index 1d819676984..7590d680eb1 100644
--- a/spec/controllers/products_controller_spec.rb
+++ b/spec/controllers/products_controller_spec.rb
@@ -29,52 +29,6 @@ module Katello
     @organization = new_test_org
   end
 
-  describe "rules" do
-    before do
-      @provider = Provider.create!(:provider_type=>Provider::CUSTOM, :name=>"foo1", :organization=>@organization)
-      Provider.stubs(:find).returns(@provider)
-      @product = OpenStruct.new(:provider => @provider, :id => 1000)
-    end
-    describe "GET New" do
-      let(:action) {:new}
-      let(:req) { get :new, :provider_id => @provider.id}
-      let(:authorized_user) do
-        user_with_permissions { |u| u.can(:update, :providers,@provider.id, @organization) }
-      end
-      let(:unauthorized_user) do
-        user_without_permissions
-      end
-      it_should_behave_like "protected action"
-    end
-
-    describe "GET Edit" do
-      before do
-        Product.stubs(:find).returns(@product)
-      end
-      let(:action) {:edit}
-      let(:req) { get :edit, :provider_id => @provider.id, :id => @product.id}
-      let(:authorized_user) do
-        user_with_permissions { |u| u.can(:read, :providers,@provider.id, @organization) }
-      end
-      let(:unauthorized_user) do
-        user_without_permissions
-      end
-      it_should_behave_like "protected action"
-    end
-
-    describe "post create" do
-      let(:action) {:create}
-      let(:req) { post :create, :provider_id => @provider.id}
-      let(:authorized_user) do
-        user_with_permissions { |u| u.can(:update, :providers,@provider.id, @organization) }
-      end
-      let(:unauthorized_user) do
-        user_without_permissions
-      end
-      it_should_behave_like "protected action"
-    end
-  end
-
   describe "get auto_complete_product" do
     before (:each) do
       Product.expects(:any_readable?).once.returns(true)
@@ -87,72 +41,6 @@ module Katello
     end
   end
 
-  describe "gpg" do
-    before do
-      disable_product_orchestration
-      disable_org_orchestration
-      disable_user_orchestration
-      set_default_locale
-      @provider = Provider.create!(:provider_type=>Provider::CUSTOM, :name=>"foo1", :organization=>@organization)
-      Provider.stubs(:find).returns(@provider)
-      test_gpg_content = File.open("#{Katello::Engine.root}/spec/assets/gpg_test_key").read
-      @gpg = GpgKey.create!(:name =>"GPG", :organization=>@organization, :content=>test_gpg_content)
-    end
-    describe "when creating a product" do
-      before do
-        @prod_name = "booyeah"
-        post :create, :provider_id => @provider.id, :product => {:name=> @prod_name, :gpg_key => @gpg.id.to_s, :label=>"boo"}
-      end
-      specify {must_respond_with(:success)}
-      subject{Product.find_by_name(@prod_name)}
-      it {wont_be_nil}
-      it { subject.name.must_equal @prod_name }
-      it { subject.gpg_key.must_equal @gpg }
-    end
-
-    describe "when updating a product" do
-      before do
-        @product = Product.new({:name=>"prod", :label=> "prod"})
-        @product.provider = @provider
-        @product.stubs(:arch).returns('noarch')
-        @product.save!
-      end
-
-      describe "without repositories wizard" do
-        before do
-          put :update, :provider_id => @provider.id, :id => @product.id,
-              :product              => { :gpg_key => @gpg.id.to_s }
-        end
-        specify { must_respond_with(:success) }
-        subject { Product.find(@product.id) }
-        it { subject.gpg_key.must_equal @gpg }
-      end
-
-      describe "with all repositories" do
-        before do
-          @product.expects(:reset_repo_gpgs!)
-          Product.stubs(:find).returns(@product)
-          put :update, :provider_id => @provider.id, :id => @product.id,
-              :product              => { :gpg_key => @gpg.id.to_s, :gpg_all_repos => "true" }
-        end
-        specify { must_respond_with(:success) }
-        subject { Product.find(@product.id) }
-        it { subject.gpg_key.must_equal @gpg }
-      end
-
-      describe "without all repositories" do
-        before do
-          @product.expects(:reset_repo_gpgs!).never
-          put :update, :provider_id => @provider.id, :id => @product.id,
-              :product              => { :gpg_key => @gpg.id.to_s, :gpg_all_repos => "false" }
-        end
-        specify { must_respond_with(:success) }
-        subject { Product.find(@product.id) }
-        it { subject.gpg_key.must_equal @gpg }
-      end
-    end
-
-  end
   end
 
 end
diff --git a/spec/controllers/subscriptions_controller_data.rb b/spec/controllers/subscriptions_controller_data.rb
deleted file mode 100644
index cf5c0fa288e..00000000000
--- a/spec/controllers/subscriptions_controller_data.rb
+++ /dev/null
@@ -1,548 +0,0 @@
-#
-# Copyright 2013 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
-module Katello
-module SubscriptionsControllerData
-  def candlepin_owner_imports action
-    case action
-      when :manifest_upload_failure
-        s = '
-[
-  {
-    "created": "2012-05-30T14:52:45.648+0000",
-    "updated": "2012-05-30T14:52:45.648+0000",
-    "id": "ff8080813798feb601379915b4d0006b",
-    "status": "FAILURE",
-    "statusMessage": "ACME_Corporation file did not import successfully."
-  },
-  {
-    "created": "2012-05-29T14:45:13.522+0000",
-    "updated": "2012-05-29T14:45:13.522+0000",
-    "id": "ff8080813798feb60137990eceb20026",
-    "status": "SUCCESS",
-    "statusMessage": "ACME_Corporation file imported successfully."
-  }
-]
-'
-      when :manifest_upload_success
-        s = '
-[
-  {
-    "created": "2012-05-30T14:52:45.648+0000",
-    "updated": "2012-05-30T14:52:45.648+0000",
-    "id": "ff8080813798feb601379915b4d0006b",
-    "status": "SUCCESS",
-    "statusMessage": "ACME_Corporation file imported successfully."
-  },
-  {
-    "created": "2012-05-29T14:45:13.522+0000",
-    "updated": "2012-05-29T14:45:13.522+0000",
-    "id": "ff8080813798feb60137990eceb20026",
-    "status": "FAILURE",
-    "statusMessage": "ACME_Corporation file did not import successfully."
-  }
-]
-'
-      else
-        s = ''
-    end
-
-    r = JSON.parse(s).collect {|s| s.with_indifferent_access}
-    Resources::Candlepin::Owner.stubs(:imports).returns(r)
-  end
-
-  def candlepin_owner_pools action
-    case action
-      when three_pools
-        s = '
-[
-  {
-    "created": "2012-05-29T14:52:45.483+0000",
-    "updated": "2012-05-29T14:52:45.483+0000",
-    "id": "ff8080813798feb601379915b42b004d",
-    "owner": {
-      "id": "ff8080813798feb6013798ff20d50001",
-      "key": "ACME_Corporation",
-      "displayName": "ACME_Corporation",
-      "href": "/owners/ACME_Corporation"
-    },
-    "activeSubscription": true,
-    "subscriptionId": "ff8080813798feb601379915b2820048",
-    "subscriptionSubKey": "master",
-    "sourceEntitlement": null,
-    "quantity": 2,
-    "startDate": "2012-05-01T04:00:00.000+0000",
-    "endDate": "2013-05-01T03:59:59.000+0000",
-    "productId": "RH1149049",
-    "providedProducts": [
-      {
-        "created": "2012-05-29T14:52:45.484+0000",
-        "updated": "2012-05-29T14:52:45.484+0000",
-        "id": "ff8080813798feb601379915b42c0059",
-        "productId": "83",
-        "productName": "Red Hat Enterprise Linux High Availability (for RHEL Server)"
-      }
-    ],
-    "attributes": [
-
-    ],
-    "productAttributes": [
-      {
-        "created": "2012-05-29T14:52:45.484+0000",
-        "updated": "2012-05-29T14:52:45.484+0000",
-        "id": "ff8080813798feb601379915b42c004e",
-        "name": "support_type",
-        "value": "L1-L3",
-        "productId": "RH1149049"
-      },
-      {
-        "created": "2012-05-29T14:52:45.484+0000",
-        "updated": "2012-05-29T14:52:45.484+0000",
-        "id": "ff8080813798feb601379915b42c004f",
-        "name": "sockets",
-        "value": "8",
-        "productId": "RH1149049"
-      },
-      {
-        "created": "2012-05-29T14:52:45.484+0000",
-        "updated": "2012-05-29T14:52:45.484+0000",
-        "id": "ff8080813798feb601379915b42c0050",
-        "name": "type",
-        "value": "MKT",
-        "productId": "RH1149049"
-      },
-      {
-        "created": "2012-05-29T14:52:45.484+0000",
-        "updated": "2012-05-29T14:52:45.484+0000",
-        "id": "ff8080813798feb601379915b42c0051",
-        "name": "name",
-        "value": "High-Availability (8 sockets)",
-        "productId": "RH1149049"
-      },
-      {
-        "created": "2012-05-29T14:52:45.484+0000",
-        "updated": "2012-05-29T14:52:45.484+0000",
-        "id": "ff8080813798feb601379915b42c0052",
-        "name": "product_family",
-        "value": "Red Hat Applications",
-        "productId": "RH1149049"
-      },
-      {
-        "created": "2012-05-29T14:52:45.484+0000",
-        "updated": "2012-05-29T14:52:45.484+0000",
-        "id": "ff8080813798feb601379915b42c0053",
-        "name": "option_code",
-        "value": "16",
-        "productId": "RH1149049"
-      },
-      {
-        "created": "2012-05-29T14:52:45.484+0000",
-        "updated": "2012-05-29T14:52:45.484+0000",
-        "id": "ff8080813798feb601379915b42c0056",
-        "name": "variant",
-        "value": "High availability",
-        "productId": "RH1149049"
-      },
-      {
-        "created": "2012-05-29T14:52:45.484+0000",
-        "updated": "2012-05-29T14:52:45.484+0000",
-        "id": "ff8080813798feb601379915b42c0055",
-        "name": "virt_limit",
-        "value": "unlimited",
-        "productId": "RH1149049"
-      },
-      {
-        "created": "2012-05-29T14:52:45.484+0000",
-        "updated": "2012-05-29T14:52:45.484+0000",
-        "id": "ff8080813798feb601379915b42c0054",
-        "name": "arch",
-        "value": "x86_64,x86",
-        "productId": "RH1149049"
-      },
-      {
-        "created": "2012-05-29T14:52:45.484+0000",
-        "updated": "2012-05-29T14:52:45.484+0000",
-        "id": "ff8080813798feb601379915b42c0057",
-        "name": "description",
-        "value": "Red Hat Applications",
-        "productId": "RH1149049"
-      },
-      {
-        "created": "2012-05-29T14:52:45.484+0000",
-        "updated": "2012-05-29T14:52:45.484+0000",
-        "id": "ff8080813798feb601379915b42c0058",
-        "name": "subtype",
-        "value": "Layered",
-        "productId": "RH1149049"
-      }
-    ],
-    "restrictedToUsername": null,
-    "contractNumber": "3020000",
-    "accountNumber": "1580789",
-    "consumed": 0,
-    "exported": 0,
-    "productName": "High-Availability (8 sockets)",
-    "href": "/pools/ff8080813798feb601379915b42b004d"
-  },
-  {
-    "created": "2012-06-11T18:22:10.660+0000",
-    "updated": "2012-06-11T18:22:10.660+0000",
-    "id": "ff808081379e16c80137dcc81ae4000e",
-    "owner": {
-      "id": "ff8080813798feb6013798ff20d50001",
-      "key": "ACME_Corporation",
-      "displayName": "ACME_Corporation",
-      "href": "/owners/ACME_Corporation"
-    },
-    "activeSubscription": true,
-    "subscriptionId": "ff808081379e16c80137dcc81982000d",
-    "subscriptionSubKey": "master",
-    "sourceEntitlement": null,
-    "quantity": -1,
-    "startDate": "2012-06-11T00:00:00.000+0000",
-    "endDate": "2042-06-04T00:00:00.000+0000",
-    "productId": "1339438930179",
-    "providedProducts": [
-
-    ],
-    "attributes": [
-
-    ],
-    "productAttributes": [
-
-    ],
-    "restrictedToUsername": null,
-    "contractNumber": "",
-    "accountNumber": "",
-    "consumed": 0,
-    "exported": 0,
-    "productName": "product",
-    "href": "/pools/ff808081379e16c80137dcc81ae4000e"
-  },
-  {
-    "created": "2012-06-13T17:35:32.568+0000",
-    "updated": "2012-06-13T17:35:32.568+0000",
-    "id": "ff808081379e16c80137e6ea20d80011",
-    "owner": {
-      "id": "ff8080813798feb6013798ff20d50001",
-      "key": "ACME_Corporation",
-      "displayName": "ACME_Corporation",
-      "href": "/owners/ACME_Corporation"
-    },
-    "activeSubscription": true,
-    "subscriptionId": "ff8080813798feb601379915b2670046",
-    "subscriptionSubKey": null,
-    "sourceEntitlement": {
-      "id": "ff808081379e16c80137e6ea20cd0010",
-      "href": "/entitlements/ff808081379e16c80137e6ea20cd0010"
-    },
-    "quantity": -1,
-    "startDate": "2012-05-01T04:00:00.000+0000",
-    "endDate": "2013-05-01T03:59:59.000+0000",
-    "productId": "RH1316844",
-    "providedProducts": [
-      {
-        "created": "2012-06-13T17:35:32.569+0000",
-        "updated": "2012-06-13T17:35:32.569+0000",
-        "id": "ff808081379e16c80137e6ea20d90022",
-        "productId": "90",
-        "productName": "Red Hat Enterprise Linux Resilient Storage (for RHEL Server)"
-      },
-      {
-        "created": "2012-06-13T17:35:32.569+0000",
-        "updated": "2012-06-13T17:35:32.569+0000",
-        "id": "ff808081379e16c80137e6ea20d90023",
-        "productId": "83",
-        "productName": "Red Hat Enterprise Linux High Availability (for RHEL Server)"
-      }
-    ],
-    "attributes": [
-      {
-        "created": "2012-06-13T17:35:32.568+0000",
-        "updated": "2012-06-13T17:35:32.568+0000",
-        "id": "ff808081379e16c80137e6ea20d80012",
-        "name": "requires_host",
-        "value": "5a493e20-01cc-466f-b1a5-0bf55431d13b"
-      },
-      {
-        "created": "2012-06-13T17:35:32.568+0000",
-        "updated": "2012-06-13T17:35:32.568+0000",
-        "id": "ff808081379e16c80137e6ea20d80013",
-        "name": "requires_consumer_type",
-        "value": "system"
-      },
-      {
-        "created": "2012-06-13T17:35:32.568+0000",
-        "updated": "2012-06-13T17:35:32.568+0000",
-        "id": "ff808081379e16c80137e6ea20d80014",
-        "name": "source_pool_id",
-        "value": "ff8080813798feb601379915b44a005b"
-      },
-      {
-        "created": "2012-06-13T17:35:32.568+0000",
-        "updated": "2012-06-13T17:35:32.568+0000",
-        "id": "ff808081379e16c80137e6ea20d80015",
-        "name": "virt_only",
-        "value": "true"
-      },
-      {
-        "created": "2012-06-13T17:35:32.568+0000",
-        "updated": "2012-06-13T17:35:32.568+0000",
-        "id": "ff808081379e16c80137e6ea20d80016",
-        "name": "pool_derived",
-        "value": "true"
-      }
-    ],
-    "productAttributes": [
-      {
-        "created": "2012-06-13T17:35:32.568+0000",
-        "updated": "2012-06-13T17:35:32.568+0000",
-        "id": "ff808081379e16c80137e6ea20d80017",
-        "name": "support_type",
-        "value": "L1-L3",
-        "productId": "RH1316844"
-      },
-      {
-        "created": "2012-06-13T17:35:32.568+0000",
-        "updated": "2012-06-13T17:35:32.568+0000",
-        "id": "ff808081379e16c80137e6ea20d80018",
-        "name": "sockets",
-        "value": "8",
-        "productId": "RH1316844"
-      },
-      {
-        "created": "2012-06-13T17:35:32.569+0000",
-        "updated": "2012-06-13T17:35:32.569+0000",
-        "id": "ff808081379e16c80137e6ea20d9001a",
-        "name": "variant",
-        "value": "Resilient Storage",
-        "productId": "RH1316844"
-      },
-      {
-        "created": "2012-06-13T17:35:32.568+0000",
-        "updated": "2012-06-13T17:35:32.568+0000",
-        "id": "ff808081379e16c80137e6ea20d90019",
-        "name": "type",
-        "value": "MKT",
-        "productId": "RH1316844"
-      },
-      {
-        "created": "2012-06-13T17:35:32.569+0000",
-        "updated": "2012-06-13T17:35:32.569+0000",
-        "id": "ff808081379e16c80137e6ea20d9001b",
-        "name": "option_code",
-        "value": "21",
-        "productId": "RH1316844"
-      },
-      {
-        "created": "2012-06-13T17:35:32.569+0000",
-        "updated": "2012-06-13T17:35:32.569+0000",
-        "id": "ff808081379e16c80137e6ea20d9001c",
-        "name": "product_family",
-        "value": "Red Hat Applications",
-        "productId": "RH1316844"
-      },
-      {
-        "created": "2012-06-13T17:35:32.569+0000",
-        "updated": "2012-06-13T17:35:32.569+0000",
-        "id": "ff808081379e16c80137e6ea20d9001d",
-        "name": "name",
-        "value": "Resilient Storage (8 sockets)",
-        "productId": "RH1316844"
-      },
-      {
-        "created": "2012-06-13T17:35:32.569+0000",
-        "updated": "2012-06-13T17:35:32.569+0000",
-        "id": "ff808081379e16c80137e6ea20d9001f",
-        "name": "virt_limit",
-        "value": "unlimited",
-        "productId": "RH1316844"
-      },
-      {
-        "created": "2012-06-13T17:35:32.569+0000",
-        "updated": "2012-06-13T17:35:32.569+0000",
-        "id": "ff808081379e16c80137e6ea20d9001e",
-        "name": "arch",
-        "value": "x86_64,x86",
-        "productId": "RH1316844"
-      },
-      {
-        "created": "2012-06-13T17:35:32.569+0000",
-        "updated": "2012-06-13T17:35:32.569+0000",
-        "id": "ff808081379e16c80137e6ea20d90020",
-        "name": "description",
-        "value": "Red Hat Applications",
-        "productId": "RH1316844"
-      },
-      {
-        "created": "2012-06-13T17:35:32.569+0000",
-        "updated": "2012-06-13T17:35:32.569+0000",
-        "id": "ff808081379e16c80137e6ea20d90021",
-        "name": "subtype",
-        "value": "Layered",
-        "productId": "RH1316844"
-      }
-    ],
-    "restrictedToUsername": null,
-    "contractNumber": "3020001",
-    "accountNumber": "1580789",
-    "consumed": 0,
-    "exported": 0,
-    "productName": "Resilient Storage (8 sockets)",
-    "href": "/pools/ff808081379e16c80137e6ea20d80011"
-  },
-  {
-    "created": "2012-05-29T14:52:45.514+0000",
-    "updated": "2012-06-13T17:35:32.569+0000",
-    "id": "ff8080813798feb601379915b44a005b",
-    "owner": {
-      "id": "ff8080813798feb6013798ff20d50001",
-      "key": "ACME_Corporation",
-      "displayName": "ACME_Corporation",
-      "href": "/owners/ACME_Corporation"
-    },
-    "activeSubscription": true,
-    "subscriptionId": "ff8080813798feb601379915b2670046",
-    "subscriptionSubKey": "master",
-    "sourceEntitlement": null,
-    "quantity": 2,
-    "startDate": "2012-05-01T04:00:00.000+0000",
-    "endDate": "2013-05-01T03:59:59.000+0000",
-    "productId": "RH1316844",
-    "providedProducts": [
-      {
-        "created": "2012-05-29T14:52:45.515+0000",
-        "updated": "2012-05-29T14:52:45.515+0000",
-        "id": "ff8080813798feb601379915b44b0067",
-        "productId": "90",
-        "productName": "Red Hat Enterprise Linux Resilient Storage (for RHEL Server)"
-      },
-      {
-        "created": "2012-05-29T14:52:45.515+0000",
-        "updated": "2012-05-29T14:52:45.515+0000",
-        "id": "ff8080813798feb601379915b44b0068",
-        "productId": "83",
-        "productName": "Red Hat Enterprise Linux High Availability (for RHEL Server)"
-      }
-    ],
-    "attributes": [
-
-    ],
-    "productAttributes": [
-      {
-        "created": "2012-05-29T14:52:45.514+0000",
-        "updated": "2012-05-29T14:52:45.514+0000",
-        "id": "ff8080813798feb601379915b44a005c",
-        "name": "support_type",
-        "value": "L1-L3",
-        "productId": "RH1316844"
-      },
-      {
-        "created": "2012-05-29T14:52:45.514+0000",
-        "updated": "2012-05-29T14:52:45.514+0000",
-        "id": "ff8080813798feb601379915b44a005d",
-        "name": "sockets",
-        "value": "8",
-        "productId": "RH1316844"
-      },
-      {
-        "created": "2012-05-29T14:52:45.515+0000",
-        "updated": "2012-05-29T14:52:45.515+0000",
-        "id": "ff8080813798feb601379915b44b005f",
-        "name": "variant",
-        "value": "Resilient Storage",
-        "productId": "RH1316844"
-      },
-      {
-        "created": "2012-05-29T14:52:45.514+0000",
-        "updated": "2012-05-29T14:52:45.514+0000",
-        "id": "ff8080813798feb601379915b44a005e",
-        "name": "type",
-        "value": "MKT",
-        "productId": "RH1316844"
-      },
-      {
-        "created": "2012-05-29T14:52:45.515+0000",
-        "updated": "2012-05-29T14:52:45.515+0000",
-        "id": "ff8080813798feb601379915b44b0060",
-        "name": "option_code",
-        "value": "21",
-        "productId": "RH1316844"
-      },
-      {
-        "created": "2012-05-29T14:52:45.515+0000",
-        "updated": "2012-05-29T14:52:45.515+0000",
-        "id": "ff8080813798feb601379915b44b0061",
-        "name": "product_family",
-        "value": "Red Hat Applications",
-        "productId": "RH1316844"
-      },
-      {
-        "created": "2012-05-29T14:52:45.515+0000",
-        "updated": "2012-05-29T14:52:45.515+0000",
-        "id": "ff8080813798feb601379915b44b0062",
-        "name": "name",
-        "value": "Resilient Storage (8 sockets)",
-        "productId": "RH1316844"
-      },
-      {
-        "created": "2012-05-29T14:52:45.515+0000",
-        "updated": "2012-05-29T14:52:45.515+0000",
-        "id": "ff8080813798feb601379915b44b0064",
-        "name": "virt_limit",
-        "value": "unlimited",
-        "productId": "RH1316844"
-      },
-      {
-        "created": "2012-05-29T14:52:45.515+0000",
-        "updated": "2012-05-29T14:52:45.515+0000",
-        "id": "ff8080813798feb601379915b44b0063",
-        "name": "arch",
-        "value": "x86_64,x86",
-        "productId": "RH1316844"
-      },
-      {
-        "created": "2012-05-29T14:52:45.515+0000",
-        "updated": "2012-05-29T14:52:45.515+0000",
-        "id": "ff8080813798feb601379915b44b0065",
-        "name": "description",
-        "value": "Red Hat Applications",
-        "productId": "RH1316844"
-      },
-      {
-        "created": "2012-05-29T14:52:45.515+0000",
-        "updated": "2012-05-29T14:52:45.515+0000",
-        "id": "ff8080813798feb601379915b44b0066",
-        "name": "subtype",
-        "value": "Layered",
-        "productId": "RH1316844"
-      }
-    ],
-    "restrictedToUsername": null,
-    "contractNumber": "3020001",
-    "accountNumber": "1580789",
-    "consumed": 1,
-    "exported": 0,
-    "productName": "Resilient Storage (8 sockets)",
-    "href": "/pools/ff8080813798feb601379915b44a005b"
-  }
-]
-'
-      else
-        s = ''
-    end
-
-    r = JSON.parse(s).collect {|s| s.with_indifferent_access}
-    Resources::Candlepin::Owner.stubs(:imports).returns(r)
-  end
-end
-end
diff --git a/spec/controllers/subscriptions_controller_spec.rb b/spec/controllers/subscriptions_controller_spec.rb
deleted file mode 100644
index 6c1b69f0294..00000000000
--- a/spec/controllers/subscriptions_controller_spec.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-# Copyright 2013 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
-require 'katello_test_helper'
-require 'controllers/subscriptions_controller_data'
-
-module Katello
-describe SubscriptionsController do
-
-  include LocaleHelperMethods
-  include OrganizationHelperMethods
-  include AuthorizationHelperMethods
-  include SubscriptionsControllerData
-
-  describe "GET index" do
-    before (:each) do
-      @organization = get_organization
-      @controller.stubs(:current_organization).returns(@organization)
-      setup_controller_defaults
-      @provider = @organization.redhat_provider
-    end
-
-    describe "before a manifest is imported" do
-      before (:each) do
-        # No upstreamUuid in owner details means no manifest is loaded, and no async tasks
-        Resources::Candlepin::Owner.stubs(:find).returns({})
-        Provider.stubs(:task_status).returns(nil)
-        User.any_instance.stubs(:legacy_mode).returns(true)
-      end
-
-      it "should open new panel for user with update permissions" do
-        setup_controller_defaults
-        get :index
-        must_respond_with(:success)
-        must_render_template("index")
-        assigns[:panel_options][:initial_state].must_equal({"panel" => :new})
-      end
-
-      it "should not open new panel for user with read permissions" do
-        @read_user = user_with_permissions { |u| u.can(:read, :organizations, nil, @organization)}
-        set_user(@read_user)
-        get :index
-        must_respond_with(:success)
-        must_render_template("index")
-        assigns[:panel_options][:initial_state].wont_equal({"panel" => :new})
-      end
-
-      it "should 403 for user with no permissions" do
-        @disallowed_user = user_without_permissions
-        set_user(@disallowed_user)
-        get :index
-        must_respond_with(403)
-      end
-    end
-=begin
-    describe "after the most recent manifest import failed" do
-      before (:each) do
-        # No upstreamUuid in owner details means no manifest is loaded, and no async tasks
-        Resources::Candlepin::Owner.stubs(:find).returns({})
-        candlepin_owner_imports :manifest_upload_failure
-        Provider.stubs(:task_status).returns(nil)
-      end
-
-      it "should open new panel for user with update permissions" do
-        get :index
-        must_respond_with(:success)
-        must_render_template("index")
-        assigns[:panel_options][:initial_state].must_equal({"panel" => :new})
-      end
-    end
-=end
-  end
-end
-end
diff --git a/spec/controllers/system_errata_controller_spec.rb b/spec/controllers/system_errata_controller_spec.rb
deleted file mode 100644
index 6fb27cf0ba5..00000000000
--- a/spec/controllers/system_errata_controller_spec.rb
+++ /dev/null
@@ -1,111 +0,0 @@
-#
-# Copyright 2013 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
-require 'katello_test_helper'
-
-module Katello
-describe SystemErrataController do
-
-  include LocaleHelperMethods
-  include SystemHelperMethods
-  include AuthorizationHelperMethods
-  include OrganizationHelperMethods
-
-  describe "main (katello)" do
-    let(:uuid) { '1234' }
-
-    before (:each) do
-      setup_controller_defaults
-
-      @organization = setup_system_creation
-      @environment = KTEnvironment.new(:name=>'test', :label=> 'test', :prior => @organization.library.id, :organization => @organization)
-      @environment.save!
-
-      @controller.stubs(:errors)
-
-      Resources::Candlepin::Consumer.stubs(:create).returns({:uuid => uuid, :owner => {:key => uuid}})
-      Resources::Candlepin::Consumer.stubs(:update).returns(true)
-
-    end
-
-    describe "viewing systems" do
-      before (:each) do
-        20.times{|a| create_system(:name=>"bar#{a}", :environment => @environment, :cp_type=>"system", :facts=>{"Test" => ""})}
-        @systems = System.select(:id).where(:environment_id => @environment.id).all.collect{|s| s.id}
-      end
-
-      describe 'and requesting errata' do
-        before (:each) do
-          @system = create_system(:name=>"verbose", :environment => @environment, :cp_type=>"system", :facts=>{"Test1"=>1, "verbose_facts" => "Test facts"})
-
-          types = [Glue::Pulp::Errata::SECURITY, Glue::Pulp::Errata::ENHANCEMENT, Glue::Pulp::Errata::BUGZILLA]
-
-          to_ret = []
-          40.times{ |num|
-            errata           = OpenStruct.new
-            errata.id        = "8a604f44-6877-4c81-b6f9-#{num}"
-            errata.errata_id = "RHSA-2011-01-#{num}"
-            errata.type      = types[rand(3)]
-            errata.release   = "Red Hat Enterprise Linux 6.0"
-            to_ret << errata
-          }
-          System.any_instance.stubs(:errata).returns(to_ret)
-        end
-
-        describe 'on initial load' do
-          it "should be successful" do
-            get :index, :system_id => @system.id
-            must_respond_with(:success)
-          end
-
-          it "should render errata template" do
-            get :index, :system_id => @system.id
-            must_render_template("index")
-          end
-        end
-
-        describe 'with an offset' do
-          it "should be successful" do
-            get :items, :system_id => @system.id, :offset => 25
-            must_respond_with(:success)
-          end
-
-          it "should render errata items" do
-            get :items, :system_id => @system.id, :offset => 25
-            must_render_template("items")
-          end
-        end
-
-        describe 'with a filter type' do
-          it "should be successful" do
-            get :items, :system_id => @system.id, :offset => 5, :filter_type => 'BugFix'
-            must_respond_with(:success)
-          end
-
-          it "should render errata items" do
-            get :items, :system_id => @system.id, :offset => 5, :filter_type => 'BugFix'
-            must_render_template("items")
-          end
-        end
-
-        describe 'with a bad filter type' do
-          it "should be unsuccessful" do
-            get :items, :system_id => @system.id, :offset => 5, :filter_type => 'Fake Type'
-            response.must_respond_with(400)
-          end
-        end
-      end
-
-    end
-  end
-end
-end
diff --git a/spec/controllers/system_events_controller_spec.rb b/spec/controllers/system_events_controller_spec.rb
deleted file mode 100644
index 2f06cdb3a46..00000000000
--- a/spec/controllers/system_events_controller_spec.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# Copyright 2013 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
-require 'katello_test_helper'
-
-module Katello
-describe SystemEventsController do
-
-  include LocaleHelperMethods
-  include SystemHelperMethods
-  include AuthorizationHelperMethods
-  include OrganizationHelperMethods
-
-  describe "main" do
-    let(:uuid) { '1234' }
-    before (:each) do
-      setup_controller_defaults
-      @organization = setup_system_creation
-      @environment = create_environment(:name=>'test', :label=> 'test', :prior => @organization.library.id, :organization => @organization)
-
-      Resources::Candlepin::Consumer.stubs(:create).returns({:uuid => uuid, :owner => {:key => uuid}})
-      Resources::Candlepin::Consumer.stubs(:update).returns(true)
-      Resources::Candlepin::Consumer.stubs(:events).returns([])
-
-      Katello.pulp_server.extensions.consumer.stubs(:create).returns({:id => uuid})
-      Katello.pulp_server.extensions.consumer.stubs(:update).returns(true)
-    end
-
-    describe "system tasks (katello)" do
-      before do
-        @system = create_system(:name=>"bar", :environment => @environment, :cp_type=>"system", :facts=>{"Test" => ""})
-      end
-      describe "shows the Tasks list" do
-        before do
-          System.any_instance.stubs(:refresh_tasks)
-          Katello.pulp_server.extensions.consumer.stubs(:install_content).returns(pulp_task_without_error)
-          Katello.pulp_server.resources.task.stubs(:poll).returns(pulp_task_without_error)
-          stub_consumer_packages_install(pulp_task_without_error)
-          @task = @system.install_packages(["foo", "bar", "bazz", "geez"])
-
-        end
-        specify "index call does the right thing" do
-          get :index, :system_id => @system.id
-          must_respond_with(:success)
-        end
-
-        specify "status call does the right thing" do
-          get :event_status, :system_id => @system.id, :task_id => @task.id
-          must_respond_with(:success)
-          JSON.parse(response.body)["tasks"].first["id"].must_equal @task.id
-        end
-
-        specify "status call does the right thing for multi tasks" do
-          task1 = @system.install_packages(["baz"])
-          get :event_status, :system_id => @system.id, :task_id => [@task.id, task1.id]
-          must_respond_with(:success)
-          JSON.parse(response.body)["tasks"].collect{|item| item['id']}.sort.must_equal [@task.id, task1.id].sort
-        end
-
-      end
-
-    end
-
-  end
-end
-end
diff --git a/spec/controllers/system_group_errata_controller_spec.rb b/spec/controllers/system_group_errata_controller_spec.rb
deleted file mode 100644
index 8e5430ffe3e..00000000000
--- a/spec/controllers/system_group_errata_controller_spec.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-#
-# Copyright 2013 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
-require 'katello_test_helper'
-
-module Katello
-describe SystemGroupErrataController do
-
-  include LocaleHelperMethods
-  include SystemHelperMethods
-  include OrchestrationHelper
-  include OrganizationHelperMethods
-  include AuthorizationHelperMethods
-
-  describe "main (katello)" do
-    let(:uuid) { '1234' }
-
-    before (:each) do
-      setup_controller_defaults
-      disable_org_orchestration
-      disable_consumer_group_orchestration
-
-      @organization = get_organization
-      @controller.stubs(:current_organization).returns(@organization)
-
-      @environment = create_environment(:name=>"DEV", :label=> "DEV",
-                                        :prior=>@organization.library, :organization=>@organization)
-
-      Resources::Candlepin::Consumer.stubs(:create).returns({:uuid => uuid, :owner => {:key => uuid}})
-      Resources::Candlepin::Consumer.stubs(:update).returns(true)
-
-      Katello.pulp_server.extensions.consumer.stubs(:create).returns({:id => uuid})
-      Katello.pulp_server.extensions.consumer.stubs(:update).returns(true)
-      System.any_instance.stubs(:update_system_groups)
-
-      @group = SystemGroup.new(:name=>"test_group", :organization=>@organization)
-      @system = create_system(:name=>"verbose", :environment => @environment, :cp_type=>"system", :facts=>{"Test1"=>1, "verbose_facts" => "Test facts"})
-      @group.save!
-      @group.systems << @system
-    end
-
-    describe "viewing system groups" do
-      describe 'and requesting errata' do
-        before (:each) do
-          types = [Glue::Pulp::Errata::SECURITY, Glue::Pulp::Errata::ENHANCEMENT, Glue::Pulp::Errata::BUGZILLA]
-
-          to_ret = []
-          40.times{ |num|
-            errata           = OpenStruct.new
-            errata.id        = "8a604f44-6877-4c81-b6f9-#{num}"
-            errata.errata_id = "RHSA-2011-01-#{num}"
-            errata.type      = types[rand(3)]
-            errata.applicable_consumers = []
-            errata.release   = "Red Hat Enterprise Linux 6.0"
-            to_ret << errata
-          }
-          Errata.stubs(:applicable_for_consumers).returns(to_ret)
-        end
-
-        describe 'on initial load' do
-          it "should be successful" do
-            get :index, :system_group_id => @group.id
-            must_respond_with(:success)
-          end
-
-          it "should render errata template" do
-            get :index, :system_group_id => @group.id
-            must_render_template("index")
-          end
-        end
-
-        describe 'with an offset' do
-          it "should be successful" do
-            get :items, :system_group_id => @group.id, :offset => 25
-            must_respond_with(:success)
-          end
-
-          it "should render errata items" do
-            get :items, :system_group_id => @group.id, :offset => 25
-            must_render_template("items")
-          end
-        end
-
-        describe 'with a filter type' do
-          it "should be successful" do
-            get :items, :system_group_id => @group.id, :offset => 5, :filter_type => 'BugFix'
-            must_respond_with(:success)
-          end
-
-          it "should render errata items" do
-            get :items, :system_group_id => @group.id, :offset => 5, :filter_type => 'BugFix'
-            must_render_template("items")
-          end
-        end
-
-      end
-    end
-  end
-end
-end
diff --git a/spec/controllers/system_group_events_controller_spec.rb b/spec/controllers/system_group_events_controller_spec.rb
deleted file mode 100644
index bc61ba296cb..00000000000
--- a/spec/controllers/system_group_events_controller_spec.rb
+++ /dev/null
@@ -1,122 +0,0 @@
-
-# Copyright 2013 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
-require 'katello_test_helper'
-
-module Katello
-describe SystemGroupEventsController do
-
-  include LocaleHelperMethods
-  include SystemHelperMethods
-  include AuthorizationHelperMethods
-  include OrchestrationHelper
-  include OrganizationHelperMethods
-
-  describe "main" do
-    let(:uuid) { '1234' }
-    before (:each) do
-      setup_controller_defaults
-      disable_org_orchestration
-      disable_consumer_group_orchestration
-
-      @organization = get_organization
-      @controller.stubs(:current_organization).returns(@organization)
-
-      @environment = create_environment(:name=>"DEV", :label=> "DEV",
-                                        :prior=>@organization.library, :organization=>@organization)
-
-      Resources::Candlepin::Consumer.stubs(:create).returns({:uuid => uuid, :owner => {:key => uuid}})
-      Resources::Candlepin::Consumer.stubs(:update).returns(true)
-
-      Katello.pulp_server.extensions.consumer.stubs(:create).returns({:id => uuid})
-      Katello.pulp_server.extensions.consumer.stubs(:update).returns(true)
-      System.any_instance.stubs(:update_system_groups)
-
-      @group = SystemGroup.new(:name=>"test_group", :organization=>@organization)
-      @system = create_system(:name=>"verbose", :environment => @environment, :cp_type=>"system", :facts=>{"Test1"=>1, "verbose_facts" => "Test facts"})
-      @group.save!
-      @group.systems << @system
-
-      SystemGroup.stubs(:find).returns(@group)
-      @job = OpenStruct.new(:pulp_id => "job_pulp_id_123", :id => 1)
-    end
-
-    describe "system group jobs (katello)" do
-
-      describe 'index' do
-        before (:each) do
-          @controller.stubs(:jobs).returns([@job])
-        end
-
-        it "should be successful" do
-          get :index, :system_group_id => @group.id
-          must_respond_with(:success)
-        end
-      end
-
-      describe 'show' do
-        before (:each) do
-          where = stub
-          where.stubs(:where).returns([@job])
-          @group.stubs(:jobs).returns(where)
-        end
-
-        it "should be successful" do
-          @controller.expects(:render).twice
-          get :show, :system_group_id => @group.id, :id => @job.id
-          must_respond_with(:success)
-        end
-      end
-
-      describe 'event_status' do
-        before (:each) do
-          @controller.stubs(:render_to_string).returns("")
-          @job.stubs(:pending?).returns(true)
-        end
-
-        it "should return a job" do
-          where = stub
-          where.stubs(:where).returns([@job])
-          @group.stubs(:refreshed_jobs).returns(where)
-
-          get :event_status, :system_group_id => @group.id, :job_id => @job.id
-          must_respond_with(:success)
-          JSON.parse(response.body)["jobs"].first["id"].must_equal @job.id
-        end
-
-        it "should return multiple jobs" do
-          job1 = OpenStruct.new(:pulp_id => "job_pulp_id_456", :id => 2)
-          job1.stubs(:pending?).returns(true)
-          where = stub
-          where.stubs(:where).returns([@job, job1])
-          @group.stubs(:refreshed_jobs).returns(where)
-
-          get :event_status, :system_group_id => @group.id, :job_id => [@job.id, job1.id]
-          must_respond_with(:success)
-          JSON.parse(response.body)["jobs"].collect{|item| item['id']}.sort.must_equal [@job.id, job1.id].sort
-        end
-
-        it "should be successful" do
-          @job.stubs(:pending?).returns(true)
-          where = stub
-          where.stubs(:where).returns([@job])
-          @group.stubs(:refreshed_jobs).returns(where)
-
-          get :event_status, :system_group_id => @group.id, :job_id => [@job.id]
-          must_respond_with(:success)
-        end
-
-      end
-    end
-  end
-end
-end
diff --git a/spec/controllers/system_group_packages_controller_spec.rb b/spec/controllers/system_group_packages_controller_spec.rb
deleted file mode 100644
index 063986f8d9c..00000000000
--- a/spec/controllers/system_group_packages_controller_spec.rb
+++ /dev/null
@@ -1,266 +0,0 @@
-#
-# Copyright 2013 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
-require 'katello_test_helper'
-
-module Katello
-describe SystemGroupPackagesController do
-
-  include LocaleHelperMethods
-  include SystemHelperMethods
-  include AuthorizationHelperMethods
-  include OrganizationHelperMethods
-
-  describe "main (katello)" do
-    let(:uuid) { '1234' }
-
-    before (:each) do
-      setup_controller_defaults
-      disable_org_orchestration
-      disable_consumer_group_orchestration
-
-      @organization = get_organization
-      @controller.stubs(:current_organization).returns(@organization)
-
-      @environment = create_environment(:name=>"DEV", :label=> "DEV",
-                                        :prior=>@organization.library, :organization=>@organization)
-
-      Resources::Candlepin::Consumer.stubs(:create).returns({:uuid => uuid, :owner => {:key => uuid}})
-      Resources::Candlepin::Consumer.stubs(:update).returns(true)
-
-      Katello.pulp_server.extensions.consumer.stubs(:create).returns({:id => uuid})
-      Katello.pulp_server.extensions.consumer.stubs(:update).returns(true)
-      System.any_instance.stubs(:update_system_groups)
-
-      @group = SystemGroup.new(:name=>"test_group", :organization=>@organization)
-      @system = create_system(:name=>"verbose", :environment => @environment, :cp_type=>"system", :facts=>{"Test1"=>1, "verbose_facts" => "Test facts"})
-      @group.save!
-      @group.systems << @system
-      @controller.expects(:render).twice
-    end
-
-    describe 'package actions' do
-      before (:each) do
-        SystemGroup.stubs(:find).returns(@group)
-
-        # mock job to be return when user invokes the 'action' on the model (e.g. install_packages)
-        @job = OpenStruct.new(:pulp_id => "job_pulp_id_123")
-      end
-
-      describe 'add packages' do
-        it 'should support receiving a comma-separated list of package names' do
-          @group.expects(:install_packages).with(["pkg1", "pkg2", "pkg3"]).returns(@job)
-          put :add, :system_group_id => @group.id, :packages => "pkg1, pkg2, pkg3"
-          must_respond_with(:success)
-        end
-
-        it 'should generate a notice on success' do
-          must_notify_with(:success)
-          @group.stubs(:install_packages).returns(@job)
-          put :add, :system_group_id => @group.id, :packages => "pkg1"
-          must_respond_with(:success)
-        end
-
-        it 'should generate an error notice, if no package names provided' do
-          must_notify_with(:error)
-          @group.expects(:install_packages).never
-          put :add, :system_group_id => @group.id, :packages => ""
-          must_respond_with(:success)
-        end
-
-        it 'should return an error notice, if no packages structure provided' do
-          must_notify_with(:error)
-          @group.expects(:install_packages).never
-          put :add, :system_group_id => @group.id
-          must_respond_with(:success)
-        end
-      end
-
-      describe 'add package groups' do
-        it 'should support receiving a comma-separated list of package group names' do
-          @group.expects(:install_package_groups).with(["grp1", "grp2", "grp3"]).returns(@job)
-          put :add, :system_group_id => @group.id, :groups => "grp1, grp2, grp3"
-          must_respond_with(:success)
-        end
-
-        it 'should generate a notice on success' do
-          must_notify_with(:success)
-          @group.stubs(:install_package_groups).returns(@job)
-          put :add, :system_group_id => @group.id, :groups => "grp1"
-          must_respond_with(:success)
-        end
-
-        it 'should generate an error notice, if no package group names provided' do
-          must_notify_with(:error)
-          @group.expects(:install_package_groups).never
-          put :add, :system_group_id => @group.id, :groups => ""
-          must_respond_with(:success)
-        end
-
-        it 'should return an error notice, if no package group structure provided' do
-          must_notify_with(:error)
-          @group.expects(:install_package_groups).never
-          put :add, :system_group_id => @group.id
-          must_respond_with(:success)
-        end
-      end
-
-      describe 'remove packages' do
-        it 'should support receiving a comma-separated list of package names' do
-          @group.expects(:uninstall_packages).with(["pkg1", "pkg2", "pkg3"]).returns(@job)
-          put :remove, :system_group_id => @group.id, :packages => "pkg1, pkg2, pkg3"
-          must_respond_with(:success)
-        end
-
-        it 'should generate a notice on success' do
-          must_notify_with(:success)
-          @group.stubs(:uninstall_packages).returns(@job)
-          put :remove, :system_group_id => @group.id, :packages => "pkg1"
-          must_respond_with(:success)
-        end
-
-        it 'should generate an error notice, if no package names provided' do
-          must_notify_with(:error)
-          @group.expects(:uninstall_packages).never
-          put :remove, :system_group_id => @group.id, :packages => ""
-          must_respond_with(:success)
-        end
-
-        it 'should return an error notice, if no packages structure provided' do
-          must_notify_with(:error)
-          @group.expects(:uninstall_packages).never
-          put :remove, :system_group_id => @group.id
-          must_respond_with(:success)
-        end
-      end
-
-      describe 'remove package groups' do
-        it 'should support receiving a comma-separated list of package group names' do
-          @group.expects(:uninstall_package_groups).with(["grp1", "grp2", "grp3"]).returns(@job)
-          put :remove, :system_group_id => @group.id, :groups => "grp1, grp2, grp3"
-          must_respond_with(:success)
-        end
-
-        it 'should generate a notice on success' do
-          must_notify_with(:success)
-          @group.stubs(:uninstall_package_groups).returns(@job)
-          put :remove, :system_group_id => @group.id, :groups => "grp1"
-          must_respond_with(:success)
-        end
-
-        it 'should generate an error notice, if no package group names provided' do
-          must_notify_with(:error)
-          @group.expects(:uninstall_package_groups).never
-          put :remove, :system_group_id => @group.id, :groups => ""
-          must_respond_with(:success)
-        end
-
-        it 'should return an error notice, if no package group structure provided' do
-          must_notify_with(:error)
-          @group.expects(:uninstall_package_groups).never
-          put :remove, :system_group_id => @group.id
-          must_respond_with(:success)
-        end
-      end
-
-      describe 'add package groups' do
-        it 'should support receiving a comma-separated list of package group names' do
-          @group.expects(:install_package_groups).with(["grp1", "grp2", "grp3"]).returns(@job)
-          put :add, :system_group_id => @group.id, :groups => "grp1, grp2, grp3"
-          must_respond_with(:success)
-        end
-
-        it 'should generate a notice on success' do
-          must_notify_with(:success)
-          @group.stubs(:install_package_groups).returns(@job)
-          put :add, :system_group_id => @group.id, :groups => "grp1"
-          must_respond_with(:success)
-        end
-
-        it 'should generate an error notice, if no package group names provided' do
-          must_notify_with(:error)
-          @group.expects(:install_package_groups).never
-          put :add, :system_group_id => @group.id, :groups => ""
-          must_respond_with(:success)
-        end
-
-        it 'should return an error notice, if no package group structure provided' do
-          must_notify_with(:error)
-          @group.expects(:install_package_groups).never
-          put :add, :system_group_id => @group.id
-          must_respond_with(:success)
-        end
-      end
-
-      describe 'update packages' do
-        it 'should support receiving a comma-separated list of package names' do
-          @group.expects(:update_packages).with(["pkg1", "pkg2", "pkg3"]).returns(@job)
-          put :update, :system_group_id => @group.id, :packages => "pkg1, pkg2, pkg3"
-          must_respond_with(:success)
-        end
-
-        it 'should generate a notice on success' do
-          must_notify_with(:success)
-          @group.stubs(:update_packages).returns(@job)
-          put :update, :system_group_id => @group.id, :packages => "pkg1"
-          must_respond_with(:success)
-        end
-      end
-
-      describe 'update all packages' do
-        it 'should support an empty package list' do
-          @group.expects(:update_packages).with([]).returns(@job)
-          put :update, :system_group_id => @group.id, :packages => ""
-          must_respond_with(:success)
-        end
-
-        it 'should generate a notice on success' do
-          must_notify_with(:success)
-          @group.stubs(:update_packages).returns(@job)
-          put :update, :system_group_id => @group.id, :packages => ""
-          must_respond_with(:success)
-        end
-      end
-
-      describe 'update package groups' do
-        it 'should support receiving a comma-separated list of package group names' do
-          @group.expects(:update_package_groups).with(["grp1", "grp2", "grp3"]).returns(@job)
-          put :update, :system_group_id => @group.id, :groups => "grp1, grp2, grp3"
-          must_respond_with(:success)
-        end
-
-        it 'should generate a notice on success' do
-          must_notify_with(:success)
-          @group.stubs(:update_package_groups).returns(@job)
-          put :update, :system_group_id => @group.id, :groups => "grp1"
-          must_respond_with(:success)
-        end
-
-        it 'should generate an error notice, if no package group names provided' do
-          must_notify_with(:error)
-          @group.expects(:update_package_groups).never
-          put :update, :system_group_id => @group.id, :groups => ""
-          must_respond_with(:success)
-        end
-
-        it 'should return an error notice, if no package group structure provided' do
-          must_notify_with(:error)
-          @group.expects(:update_package_groups).never
-          put :update, :system_group_id => @group.id
-          must_respond_with(:success)
-        end
-      end
-
-    end
-  end
-end
-end
diff --git a/spec/controllers/system_groups_controller_spec.rb b/spec/controllers/system_groups_controller_spec.rb
index f646851201e..8c10ecf9607 100644
--- a/spec/controllers/system_groups_controller_spec.rb
+++ b/spec/controllers/system_groups_controller_spec.rb
@@ -18,7 +18,6 @@ module Katello
   include LocaleHelperMethods
   include OrganizationHelperMethods
   include OrchestrationHelper
-  include SystemHelperMethods
   include AuthorizationHelperMethods
 
   describe "(katello)" do
@@ -34,20 +33,6 @@ module Katello
     @environment = create_environment(:name=>"DEV", :label=> "DEV", :prior=>@org.library, :organization=>@org)
     @org = @org.reload
     @controller.stubs(:current_organization).returns(@org)
-    setup_system_creation
-    Resources::Candlepin::Consumer.stubs(:create).returns({:uuid => uuid, :owner => {:key => uuid}})
-    Resources::Candlepin::Consumer.stubs(:update).returns(true)
-    Resources::Candlepin::Consumer.stubs(:destroy).returns(true)
-    SystemGroup.any_instance.stubs(:set_pulp_consumer_group).returns({})
-    SystemGroup.any_instance.stubs(:del_pulp_consumer_group).returns({})
-    SystemGroup.any_instance.stubs(:add_consumer).returns({})
-    SystemGroup.any_instance.stubs(:remove_consumer).returns({})
-    System.any_instance.stubs(:update_system_groups)
-    System.any_instance.stubs(:update_pulp_consumer).returns({})
-    System.any_instance.stubs(:del_pulp_consumer).returns({})
-    Katello.pulp_server.extensions.consumer.stubs(:delete).returns(true)
-
-    @system = create_system(:name=>"bar1", :environment => @environment, :cp_type=>"system", :facts=>{"Test" => ""})
   end
 
   describe "Controller tests " do
@@ -72,323 +57,6 @@ module Katello
       end
     end
 
-    describe "GET items" do
-
-      let(:action) {:items}
-      let(:req) { get :items }
-      let(:authorized_user) do
-        user_with_permissions { |u| u.can(:read, :system_groups, @group.id, @org) }
-      end
-      let(:unauthorized_user) do
-        user_without_permissions
-      end
-      it_should_behave_like "protected action"
-
-      it "requests filters using search criteria" do
-        @controller.stubs(:render)
-        @controller.expects(:render_panel_direct)
-        get :items
-        must_respond_with(:success)
-      end
-    end
-
-    describe "GET new" do
-
-      let(:action) {:new}
-      let(:req) { get :new }
-      let(:authorized_user) do
-        user_with_permissions { |u| u.can(:create, :system_groups, nil, @org) }
-      end
-      let(:unauthorized_user) do
-        user_without_permissions
-      end
-      it_should_behave_like "protected action"
-
-      it "should return successfully" do
-        get :new
-        must_respond_with(:success)
-        assigns(:group).wont_be_nil
-      end
-    end
-
-    describe "GET edit" do
-      let(:action) {:edit}
-      let(:req) { get :edit, :id=>@group.id }
-      let(:authorized_user) do
-        user_with_permissions { |u| u.can(:read, :system_groups, @group.id, @org) }
-      end
-      let(:unauthorized_user) do
-        user_without_permissions
-      end
-      it_should_behave_like "protected action"
-
-      it "should return successfully" do
-        get :edit, :id=>@group.id
-        must_respond_with(:success)
-        assigns(:group).id.must_equal @group.id
-      end
-    end
-
-    describe "GET show" do
-      let(:action) {:show}
-      let(:req) { get :show, :id=>@group.id }
-      let(:authorized_user) do
-        user_with_permissions { |u| u.can(:read, :system_groups, @group.id, @org) }
-      end
-      let(:unauthorized_user) do
-        user_without_permissions
-      end
-      it_should_behave_like "protected action"
-
-      it "should return successfully" do
-        get :show, :id=>@group.id
-        must_respond_with(:success)
-        assigns(:group).id.must_equal @group.id
-      end
-    end
-
-    describe "POST create" do
-
-      let(:action) {:create}
-      let(:req) { post :create }
-      let(:authorized_user) do
-        user_with_permissions { |u| u.can(:create, :system_groups, @group.id, @org) }
-      end
-      let(:unauthorized_user) do
-        user_without_permissions
-      end
-      it_should_behave_like "protected action"
-
-      it "should create a group correctly" do
-        post :create, :system_group=>{:name=>"foo", :description=>"describe"}
-        must_respond_with(:success)
-        SystemGroup.where(:name=>"foo").first.wont_be_nil
-      end
-      it "should not create a group without a name" do
-        post :create, :system_group=>{:description=>"describe"}
-        response.must_respond_with(422)
-        SystemGroup.where(:description=>"describe").first.must_be_nil
-      end
-      it "should allow two groups with the same name in different orgs" do
-        @org2 = Organization.create!(:name=>'test_org2', :label=> 'test_org2')
-        @controller.stubs(:current_organization).returns(@org2)
-        post :create, :system_group=>{:name=>@group.name, :description=>@group.description}
-        must_respond_with(:success)
-        SystemGroup.where(:name=>@group.name).count.must_equal 2
-      end
-      it "should not allow a group to be created that already exists" do
-        post :create, :system_group=>{:name=>@group.name, :description=>@group.description}
-        response.must_respond_with(422)
-        SystemGroup.where(:name=>@group.name).count.must_equal 1
-      end
-    end
-
-    describe "POST copy" do
-      before(:each) do
-        @group.max_systems = 10
-        @group.systems = [@system]
-        @group.save
-      end
-
-      let(:action) {:copy}
-      let(:req) { post :copy, :id => @group.id}
-      let(:authorized_user) do
-        user_with_permissions { |u| u.can(:create, :system_groups, @group.id, @org) }
-      end
-      let(:unauthorized_user) do
-        user_without_permissions
-      end
-      it_should_behave_like "protected action"
-
-      it "should copy a group correctly" do
-        must_notify_with(:success)
-        post :copy, :id => @group.id, :name=>"foo", :description=>"describe"
-        must_respond_with(:success)
-        SystemGroup.where(:name=>"foo", :description=>"describe", :max_systems=>10).first.wont_be_nil
-      end
-      it "should copy without a description provided" do
-        must_notify_with(:success)
-        post :copy, :id => @group.id, :name=>"foo"
-        must_respond_with(:success)
-        SystemGroup.where(:name=>"foo", :max_systems=>10).first.wont_be_nil
-      end
-      it "should not copy a group without a name" do
-        must_notify_with(:exception)
-        post :copy, :id => @group.id, :description=>"describe"
-        response.must_respond_with(422)
-        SystemGroup.where(:description=>"describe").first.must_be_nil
-      end
-      it "should not allow a group to be copied with a name that already exists" do
-        must_notify_with(:exception)
-        post :copy, :id => @group.id, :name=>@group.name, :description=>"describe"
-        response.must_respond_with(422)
-        SystemGroup.where(:name=>@group.name).count.must_equal 1
-      end
-    end
-
-    describe "PUT update" do
-
-      let(:action) {:update}
-      let(:req) { post :update, :id=>@group.id }
-      let(:authorized_user) do
-        user_with_permissions { |u| u.can(:update, :system_groups, @group.id, @org) }
-      end
-      let(:unauthorized_user) do
-        user_without_permissions
-      end
-      it_should_behave_like "protected action"
-
-      it "should allow name to be changed" do
-        old_name = @group.name
-        put :update, :id=>@group.id, :system_group=>{:name=>"rocky"}
-        must_respond_with(:success)
-        SystemGroup.where(:name=>'rocky').first.wont_be_nil
-        SystemGroup.where(:name=>old_name).first.must_be_nil
-
-      end
-    end
-
-    describe "POST add systems" do
-      it "should allow adding of systems" do
-        post :add_systems, :id=>@group.id, :system_ids=>[@system.id]
-        must_respond_with(:success)
-        @group.reload.systems.must_include @system
-      end
-
-      let(:action) {:add_systems}
-        let(:req) { post :add_systems, :id=>@group.id, :system_ids=>[] }
-        let(:authorized_user) do
-          user_with_permissions { |u| u.can(:update, :system_groups, @group.id, @org) }
-        end
-        let(:unauthorized_user) do
-          user_without_permissions
-        end
-        it_should_behave_like "protected action"
-    end
-
-    describe "POST remove_systems" do
-      let(:action) {:remove_systems}
-      let(:req) { post :remove_systems, :id=>@group.id, :system_ids=>[] }
-      let(:authorized_user) do
-        user_with_permissions { |u| u.can(:update, :system_groups, @group.id, @org) }
-      end
-      let(:unauthorized_user) do
-        user_without_permissions
-      end
-      it_should_behave_like "protected action"
-
-      it "should allow removal of systems" do
-        @group.systems  = [@system]
-        @group.save
-        post :remove_systems, :id=>@group.id, :system_ids=>[@system.id]
-        must_respond_with(:success)
-        @group.reload.systems.wont_include @system
-      end
-    end
-
-    describe "DELETE destroy" do
-      let(:action) {:destroy}
-      let(:req) { delete :destroy, :id=>@group.id}
-      let(:authorized_user) do
-        user_with_permissions { |u| u.can(:delete, :system_groups, @group.id, @org) }
-      end
-      let(:unauthorized_user) do
-        user_without_permissions
-      end
-      it_should_behave_like "protected action"
-
-      it "should complete successfully" do
-        @controller.stubs(:render)
-        delete :destroy, :id=>@group.id
-        must_respond_with(:success)
-        SystemGroup.where(:name=>@group.name).first.must_be_nil
-      end
-    end
-
-    describe "DELETE destroy_systems" do
-      let(:action) {:destroy_systems}
-      let(:req) { delete :destroy_systems, :id=>@group.id}
-      let(:authorized_user) do
-        user_with_permissions { |u| u.can(:delete_systems, :system_groups, @group.id, @org) }
-      end
-      let(:unauthorized_user) do
-        user_without_permissions
-      end
-      it_should_behave_like "protected action"
-
-      it "should complete successfully" do
-        @group.systems  = [@system]
-        @group.save
-
-        delete :destroy_systems, :id=>@group.id
-        must_respond_with(:success)
-        SystemGroup.where(:name=>@group.name).first.must_be_nil
-      end
-    end
-
-    describe "GET edit_systems" do
-      let(:action) {:edit_systems}
-      let(:req) { get :edit_systems, :id => @group.id}
-      let(:authorized_user) do
-        user_with_permissions { |u| u.can(:update_systems, :system_groups, @group.id, @org) }
-      end
-      let(:unauthorized_user) do
-        user_without_permissions
-      end
-      it_should_behave_like "protected action"
-
-      it "should render edit_systems partial" do
-        get :edit_systems, :id => @group.id
-        must_respond_with(:success)
-        must_render_template(:partial => '_edit_systems')
-      end
-    end
-
-    describe "PUT update_systems" do
-      before(:each) do
-        Resources::Candlepin::Consumer.stubs(:get).returns({:uuid => uuid, :owner => {:key => uuid}})
-
-        @next_environment = create_environment(:name => "TEST", :label => "TEST", :prior => @environment,
-                                                 :organization => @org)
-        promote_content_view(@environment.content_views.first, @environment, @next_environment)
-        @system2 = create_system(:name=>"bar2", :environment => @environment, :cp_type=>"system", :facts=>{"Test" => ""})
-
-        @group.systems = [@system, @system2]
-        @group.save
-      end
-
-      let(:action) {:update_systems}
-      let(:req) { put :update_systems, :id => @group.id}
-      let(:authorized_user) do
-        user_with_permissions { |u| u.can(:update_systems, :system_groups, @group.id, @org) }
-      end
-      let(:unauthorized_user) do
-        user_without_permissions
-      end
-      it_should_behave_like "protected action"
-
-      it "should update all systems successfully" do
-        must_notify_with(:success)
-
-        put :update_systems, :id => @group.id, :update_fields => {:environment_id => @next_environment.id}
-
-        must_respond_with(:success)
-        @system.reload.environment.must_equal @next_environment
-        @system2.reload.environment.must_equal @next_environment
-      end
-
-      it "should update only specified systems successfully" do
-        must_notify_with(:success)
-
-        put :update_systems, :id => @group.id, :systems => {@system.id.to_s => @system.id.to_s},
-            :update_fields => {:environment_id => @next_environment.id}
-
-        must_respond_with(:success)
-        @system.reload.environment.must_equal @next_environment
-        @system2.reload.environment.must_equal @environment
-      end
-    end
-
   end
   end
 end
diff --git a/spec/controllers/system_packages_controller_spec.rb b/spec/controllers/system_packages_controller_spec.rb
deleted file mode 100644
index a7a3ae55618..00000000000
--- a/spec/controllers/system_packages_controller_spec.rb
+++ /dev/null
@@ -1,278 +0,0 @@
-#
-# Copyright 2013 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
-require 'katello_test_helper'
-
-module Katello
-describe SystemPackagesController do
-
-  include LocaleHelperMethods
-  include SystemHelperMethods
-  include AuthorizationHelperMethods
-  include OrganizationHelperMethods
-
-  describe "main (katello)" do
-    let(:uuid) { '1234' }
-
-    before (:each) do
-      setup_controller_defaults
-
-      @organization = setup_system_creation
-      @environment = KTEnvironment.new(:name=>'test', :label=> 'test', :prior => @organization.library.id, :organization => @organization)
-      @environment.save!
-
-      Resources::Candlepin::Consumer.stubs(:create).returns({:uuid => uuid, :owner => {:key => uuid}})
-      Resources::Candlepin::Consumer.stubs(:update).returns(true)
-
-      Katello.pulp_server.extensions.consumer.stubs(:create).returns({:id => uuid})
-      Katello.pulp_server.extensions.consumer.stubs(:update).returns(true)
-    end
-
-    describe "viewing packages" do
-      before (:each) do
-        100.times{|a| create_system(:name=>"bar#{a}", :environment => @environment, :cp_type=>"system", :facts=>{"Test" => ""})}
-        @systems = System.select(:id).where(:environment_id => @environment.id).all.collect{|s| s.id}
-      end
-
-      describe 'and requesting individual data' do
-        before (:each) do
-          @system = create_system(:name=>"verbose", :environment => @environment, :cp_type=>"system", :facts=>{"Test1"=>1, "verbose_facts" => "Test facts"})
-
-          System.any_instance.stubs(:fetch_package_profile).returns({"profile" => []})
-
-          Resources::Candlepin::Consumer.stubs(:events).returns([])
-        end
-
-        it "should show packages" do
-          get :packages, :system_id => @system.id
-          must_respond_with(:success)
-          must_render_template("packages")
-        end
-      end
-    end
-
-    describe 'package actions' do
-      before (:each) do
-        @system = create_system(:name=>"bar", :environment => @environment, :cp_type=>"system", :facts=>{"Test" => ""})
-        System.stubs(:find).returns(@system)
-
-        # mock task to be return when user invokes the 'action' on the model (e.g. install_packages)
-        @task_status = OpenStruct.new(:id => "99")
-      end
-
-      describe 'add packages' do
-        it 'should support receiving a comma-separated list of package names' do
-          @system.expects(:install_packages).with(["pkg1", "pkg2", "pkg3"]).returns(@task_status)
-          put :add, :system_id => @system.id, :packages => "pkg1, pkg2, pkg3"
-          must_respond_with(:success)
-        end
-
-        it 'should generate a notice on success' do
-          must_notify_with(:success)
-          @system.stubs(:install_packages).returns(@task_status)
-          put :add, :system_id => @system.id, :packages => "pkg1"
-          must_respond_with(:success)
-        end
-
-        it 'should render a task uuid on success' do
-          @system.stubs(:install_packages).returns(@task_status)
-          put :add, :system_id => @system.id, :packages => "pkg1"
-          must_respond_with(:success)
-          response.body.must_include(@task_status.id)
-        end
-
-        it 'should generate an error notice, if no package names provided' do
-          must_notify_with(:error)
-          @system.expects(:install_packages).never
-          put :add, :system_id => @system.id, :packages => ""
-          must_respond_with(:success)
-          response.wont_include(@task_status.id)
-        end
-
-        it 'should return an error notice, if no packages structure provided' do
-          must_notify_with(:error)
-          @system.expects(:install_packages).never
-          put :add, :system_id => @system.id
-          must_respond_with(:success)
-          response.wont_include(@task_status.id)
-        end
-      end
-
-      describe 'add package groups' do
-        it 'should support receiving a comma-separated list of package groups' do
-          @system.expects(:install_package_groups).with(["group 1", "group 2", "group3"]).returns(@task_status)
-          put :add, :system_id => @system.id, :groups => "group 1, group 2, group3"
-          must_respond_with(:success)
-        end
-
-        it 'should generate a notice on success' do
-          must_notify_with(:success)
-          @system.stubs(:install_package_groups).returns(@task_status)
-          put :add, :system_id => @system.id, :groups => "group 1"
-          must_respond_with(:success)
-        end
-
-        it 'should render a task uuid on success' do
-          @system.stubs(:install_package_groups).returns(@task_status)
-          put :add, :system_id => @system.id, :groups => "group 1"
-          must_respond_with(:success)
-          response.body.must_include(@task_status.id)
-        end
-
-        it 'should generate an error notice, if no groups names provided' do
-          must_notify_with(:error)
-          @system.expects(:install_package_groups).never
-          put :add, :system_id => @system.id, :groups => ""
-          must_respond_with(:success)
-          response.wont_include(@task_status.id)
-        end
-
-        it 'should return an error notice, if no group structure provided' do
-          must_notify_with(:error)
-          @system.expects(:install_package_groups).never
-          put :add, :system_id => @system.id
-          must_respond_with(:success)
-          response.wont_include(@task_status.id)
-        end
-      end
-
-      describe 'remove packages' do
-        it 'should support receiving a comma-separated list of package names' do
-          @system.expects(:uninstall_packages).with(["pkg1", "pkg2", "pkg3"]).returns(@task_status)
-          put :remove, :system_id => @system.id, :packages => "pkg1, pkg2, pkg3"
-          must_respond_with(:success)
-        end
-
-        it 'should support receiving a hash of package names' do
-          @system.expects(:uninstall_packages).with(["pkg1", "pkg2", "pkg3"]).returns(@task_status)
-          put :remove, :system_id => @system.id, :package => {"pkg1" => 1, "pkg2" => 1, "pkg3" => 1}
-          must_respond_with(:success)
-        end
-
-        it 'should generate a notice on success' do
-          must_notify_with(:success)
-          @system.stubs(:uninstall_packages).returns(@task_status)
-          put :remove, :system_id => @system.id, :packages => "pkg1"
-          must_respond_with(:success)
-        end
-
-        it 'should render a task uuid on success' do
-          @system.stubs(:uninstall_packages).returns(@task_status)
-          put :remove, :system_id => @system.id, :packages => "pkg1"
-          must_respond_with(:success)
-          response.body.must_include(@task_status.id)
-        end
-
-        it 'should generate an error notice, if no packages provided' do
-          must_notify_with(:error)
-          @system.expects(:uninstall_packages).never
-          put :remove, :system_id => @system.id, :packages => ""
-          must_respond_with(:success)
-          response.wont_include(@task_status.id)
-        end
-
-        it 'should return an error notice, if no packages structure provided' do
-          must_notify_with(:error)
-          @system.expects(:uninstall_packages).never
-          put :remove, :system_id => @system.id
-          must_respond_with(:success)
-          response.wont_include(@task_status.id)
-        end
-      end
-
-      describe 'remove package groups' do
-        it 'should support receiving a comma-separated list of package groups' do
-          @system.expects(:uninstall_package_groups).with(["group 1", "group 2", "group3"]).returns(@task_status)
-          put :remove, :system_id => @system.id, :groups => "group 1, group 2, group3"
-          must_respond_with(:success)
-        end
-
-        it 'should generate a notice on success' do
-          must_notify_with(:success)
-          @system.stubs(:uninstall_package_groups).returns(@task_status)
-          put :remove, :system_id => @system.id, :groups => "group 1"
-          must_respond_with(:success)
-        end
-
-        it 'should render a task uuid on success' do
-          @system.stubs(:uninstall_package_groups).returns(@task_status)
-          put :remove, :system_id => @system.id, :groups => "group 1"
-          must_respond_with(:success)
-          response.body.must_include(@task_status.id)
-        end
-
-        it 'should generate an error notice, if no group names provided' do
-          must_notify_with(:error)
-          @system.expects(:uninstall_package_groups).never
-          put :remove, :system_id => @system.id, :groups => ""
-          must_respond_with(:success)
-          response.wont_include(@task_status.id)
-        end
-
-        it 'should return an error notice, if no groups structure provided' do
-          must_notify_with(:error)
-          @system.expects(:uninstall_package_groups).never
-          put :remove, :system_id => @system.id
-          must_respond_with(:success)
-          response.wont_include(@task_status.id)
-        end
-      end
-
-      describe 'update packages' do
-        describe 'list of packages provided' do
-          it 'should support receiving a hash of package names' do
-            @system.expects(:update_packages).with(["pkg1", "pkg2", "pkg3"]).returns(@task_status)
-            put :update, :system_id => @system.id, :package => {"pkg1" => 1, "pkg2" => 1, "pkg3" => 1}
-            must_respond_with(:success)
-          end
-
-          it 'should generate a notice on success' do
-            must_notify_with(:success)
-            @system.stubs(:update_packages).returns(@task_status)
-            put :update, :system_id => @system.id, :packages => {"pkg1" => 1}
-            must_respond_with(:success)
-          end
-
-          it 'should render a task uuid on success' do
-            @system.stubs(:update_packages).returns(@task_status)
-            put :update, :system_id => @system.id, :packages => {"pkg1" => 1}
-            must_respond_with(:success)
-            response.body.must_include(@task_status.id)
-          end
-        end
-
-        describe 'no packages provided (update all)' do
-          it 'treat request without packages as an update all' do
-            @system.expects(:update_packages).with(nil).returns(@task_status)
-            put :update, :system_id => @system.id
-            must_respond_with(:success)
-          end
-
-          it 'should generate a notice on success' do
-            must_notify_with(:success)
-            @system.stubs(:update_packages).returns(@task_status)
-            put :update, :system_id => @system.id
-            must_respond_with(:success)
-          end
-
-          it 'should render a task uuid on success' do
-            @system.stubs(:update_packages).returns(@task_status)
-            put :update, :system_id => @system.id
-            must_respond_with(:success)
-            response.body.must_include(@task_status.id)
-          end
-        end
-      end
-    end
-  end
-end
-end
diff --git a/test/controllers/api/v2/repository_sets_controller_test.rb b/test/controllers/api/v2/repository_sets_controller_test.rb
deleted file mode 100644
index d83e487757e..00000000000
--- a/test/controllers/api/v2/repository_sets_controller_test.rb
+++ /dev/null
@@ -1,121 +0,0 @@
-# encoding: utf-8
-#
-# Copyright 2013 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
-require "katello_test_helper"
-
-module Katello
-  class Api::V2::RepositorySetsControllerTest < ActionController::TestCase
-
-    def self.before_suite
-      models = %w(Organization KTEnvironment Product)
-      disable_glue_layers(["Pulp", "ElasticSearch"], models)
-      super
-    end
-
-    def models
-      @organization = get_organization
-      @redhat_product = katello_products(:redhat)
-      @custom_product = katello_products(:fedora)
-      @pc = Katello::Candlepin::ProductContent.new(:content => {:id => '3'})
-      @pc.product = @redhat_product
-    end
-
-    def permissions
-      @read_permission = UserPermission.new(:read, :providers)
-      @update_permission = UserPermission.new(:redhat_products, :organizations)
-      @no_permission = NO_PERMISSION
-    end
-
-    def setup
-      setup_controller_defaults_api
-      login_user(User.find(users(:admin)))
-      @request.env["HTTP_ACCEPT"] = 'application/json'
-      models
-      permissions
-    end
-
-    def test_index
-      Katello::Product.any_instance.stubs(:productContent).returns([])
-      get :index, :product_id => @redhat_product.id
-
-      assert_response :success
-      assert_template 'api/v2/repository_sets/index'
-    end
-
-    def test_index_protected
-      allowed_perms = [@read_permission]
-      denied_perms = [@no_permission]
-
-      assert_protected_action(:index, allowed_perms, denied_perms) do
-        get :index, :product_id => @redhat_product.id
-      end
-    end
-
-    def test_show
-      Katello::Product.any_instance.stubs(:productContent).returns([@pc])
-      get :show, :product_id => @redhat_product.id, :id => 3
-
-      assert_response :success
-      assert_template 'api/v2/repository_sets/show'
-    end
-
-    def test_show_protected
-      Katello::Product.any_instance.stubs(:productContent).returns([@pc])
-      allowed_perms = [@read_permission]
-      denied_perms = [@no_permission]
-
-      assert_protected_action(:show, allowed_perms, denied_perms) do
-        get :show, :product_id => @redhat_product.id, :id => 3
-      end
-    end
-
-    def test_enable
-      Katello::Product.any_instance.stubs(:productContent).returns([@pc])
-      Katello::Product.any_instance.expects(:refresh_content).with('3').returns(@pc)
-      put :enable, :product_id => @redhat_product.id, :id => 3
-
-      assert_response :success
-      assert_template 'api/v2/repository_sets/show'
-    end
-
-    def test_enable_protected
-      Katello::Product.any_instance.stubs(:productContent).returns([@pc])
-      allowed_perms = [@update_permission]
-      denied_perms = [@no_permission]
-
-      assert_protected_action(:enable, allowed_perms, denied_perms) do
-        put :enable, :product_id => @redhat_product.id, :id => 3
-      end
-    end
-
-    def test_disable
-      Katello::Product.any_instance.stubs(:productContent).returns([@pc])
-      Katello::Product.any_instance.expects(:disable_content).with('3').returns(@pc)
-      put :disable, :product_id => @redhat_product.id, :id => 3
-
-      assert_response :success
-      assert_template 'api/v2/repository_sets/show'
-    end
-
-    def test_disable_protected
-      Katello::Product.any_instance.stubs(:productContent).returns([@pc])
-      allowed_perms = [@update_permission]
-      denied_perms = [@no_permission]
-
-      assert_protected_action(:disable, allowed_perms, denied_perms) do
-        put :disable, :product_id => @redhat_product.id, :id => 3
-      end
-    end
-
-  end
-end
diff --git a/test/controllers/subscriptions_controller_test.rb b/test/controllers/subscriptions_controller_test.rb
new file mode 100644
index 00000000000..27e8a830b41
--- /dev/null
+++ b/test/controllers/subscriptions_controller_test.rb
@@ -0,0 +1,37 @@
+# encoding: utf-8
+#
+# Copyright 2014 Red Hat, Inc.
+#
+# This software is licensed to you under the GNU General Public
+# License as published by the Free Software Foundation; either version
+# 2 of the License (GPLv2) or (at your option) any later version.
+# There is NO WARRANTY for this software, express or implied,
+# including the implied warranties of MERCHANTABILITY,
+# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
+# have received a copy of GPLv2 along with this software; if not, see
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+
+require "katello_test_helper"
+
+module Katello
+  class SubscriptionsControllerTest < ActionController::TestCase
+
+    def setup
+      setup_controller_defaults
+      @org = get_organization
+      @provider = katello_providers(:redhat)
+      login_user(User.find(users(:admin)))
+      set_organization(@org)
+
+      models = ["Organization", "KTEnvironment", "Provider", "Product"]
+      services = ["Candlepin", "Pulp", "ElasticSearch", "Foreman"]
+      disable_glue_layers(services, models)
+    end
+
+    test 'test index should be successful' do
+      get :index
+      assert_response :success
+    end
+
+  end
+end
diff --git a/test/controllers/systems_controller_test.rb b/test/controllers/systems_controller_test.rb
deleted file mode 100644
index c3d827c968a..00000000000
--- a/test/controllers/systems_controller_test.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-# encoding: utf-8
-#
-# Copyright 2013 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
-require "katello_test_helper"
-
-module Katello
-describe SystemsController do
-
-  before do
-    models = ["Organization", "KTEnvironment", "User", "Filter",
-                "FilterRule", "ErratumRule", "PackageRule", "PackageGroupRule",
-                "ContentViewEnvironment", "ContentViewDefinition", "System"]
-    disable_glue_layers(["Candlepin", "Pulp", "ElasticSearch"], models)
-    setup_controller_defaults
-    @system = katello_systems(:simple_server)
-    @org = @system.organization
-    set_organization(@org)
-  end
-
-  describe "update"  do
-    before do
-      @content_view = katello_content_views(:library_dev_view)
-      @cv_id = @content_view.id
-      @env_id = @system.environment.id
-      @subscribe_permission = UserPermission.new(:subscribe, :content_views, @cv_id, @content_view.organization)
-      @edit_system_perm = UserPermission.new(:update_systems, :environments,
-                          @env_id, @system.environment.organization)
-
-      @req = lambda do
-        put :update, :id => @system.id, :system => {:content_view_id => @cv_id}
-      end
-    end
-
-    it "permission" do
-      master_perm = @subscribe_permission + @edit_system_perm
-      action = :update
-      assert_authorized(
-                :permission => master_perm,
-                :action => action,
-                :request => @req
-      )
-      refute_authorized(
-          :permission => [@edit_system_perm, @subscribe_permission, NO_PERMISSION],
-          :action => action,
-          :request => @req
-      )
-    end
-  end
-end
-end