diff --git a/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
index 6adb0b451b..72b12107bc 100644
--- a/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
+++ b/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
@@ -56,7 +56,7 @@
         </section>
     </div>
 
-    <umg-login></umg-login>
+    <umb-login></umb-login>
     <umb-notifications></umb-notifications>
 
     <script  src="lib/require/require.min.js" type="text/javascript"></script>
diff --git a/src/Umbraco.Web.UI/umbraco/js/umbraco.controllers.js b/src/Umbraco.Web.UI/umbraco/js/umbraco.controllers.js
index b77424fade..8b99543807 100644
--- a/src/Umbraco.Web.UI/umbraco/js/umbraco.controllers.js
+++ b/src/Umbraco.Web.UI/umbraco/js/umbraco.controllers.js
@@ -7,20 +7,7 @@
 
 define(['angular'], function (angular) {
 
-    /**
-    * @ngdoc controller
-    * @name umbraco.ContainerController
-    * @function
-    * 
-    * @description
-    * The container controller which is used to load in the html templates so html devs need not worry about the razor markup
-    */
-    var containerController = function ($scope) {
-        $scope.applicationView = "views/index.html";
-    };    
-    angular.module('umbraco').controller("ContainerController", containerController);
-
-
+   
     //Handles the section area of the app
     angular.module('umbraco').controller("NavigationController",
         function ($scope, $window, $log, tree, section, $rootScope, $routeParams, dialog, $q) {
diff --git a/src/Umbraco.Web/Trees/ApplicationTreeApiController.cs b/src/Umbraco.Web/Trees/ApplicationTreeApiController.cs
index 16b33c86dd..7b26340356 100644
--- a/src/Umbraco.Web/Trees/ApplicationTreeApiController.cs
+++ b/src/Umbraco.Web/Trees/ApplicationTreeApiController.cs
@@ -13,10 +13,8 @@ using umbraco.cms.presentation.Trees;
 namespace Umbraco.Web.Trees
 {
 
-    //NOTE: We will of course have to authorized this but changing the base class once integrated
-
     [PluginController("UmbracoTrees")]
-    public class ApplicationTreeApiController : UmbracoApiController //UmbracoAuthorizedApiController
+    public class ApplicationTreeApiController : UmbracoAuthorizedApiController
     {
 
         /// <summary>
diff --git a/src/Umbraco.Web/Trees/LegacyTreeApiController.cs b/src/Umbraco.Web/Trees/LegacyTreeApiController.cs
index 4d5b2a4c14..4e6a9f87f5 100644
--- a/src/Umbraco.Web/Trees/LegacyTreeApiController.cs
+++ b/src/Umbraco.Web/Trees/LegacyTreeApiController.cs
@@ -10,13 +10,12 @@ using umbraco.businesslogic;
 
 namespace Umbraco.Web.Trees
 {
-    //NOTE: We will of course have to authorized this but changing the base class once integrated
 
     /// <summary>
     /// This is used to output JSON from legacy trees
     /// </summary>
     [PluginController("UmbracoTrees")]
-    public class LegacyTreeApiController : UmbracoApiController //UmbracoAuthorizedApiController
+    public class LegacyTreeApiController : UmbracoAuthorizedApiController
     {
         /// <summary>
         /// Convert a legacy tree to a new tree result
diff --git a/src/Umbraco.Web/Trees/TreeApiController.cs b/src/Umbraco.Web/Trees/TreeApiController.cs
index 00a072435f..b810a1a2c8 100644
--- a/src/Umbraco.Web/Trees/TreeApiController.cs
+++ b/src/Umbraco.Web/Trees/TreeApiController.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Web.Trees
     /// <summary>
     /// The base controller for all tree requests
     /// </summary>    
-    public abstract class TreeApiController : UmbracoApiController //UmbracoAuthorizedApiController
+    public abstract class TreeApiController : UmbracoAuthorizedApiController
     {
         /// <summary>
         /// Remove the xml formatter... only support JSON!