diff --git a/awx/ui/client/src/network-ui/extract_messages.js b/awx/ui/client/src/network-ui/extract_messages.js
index aee32413de..80e96f09be 100755
--- a/awx/ui/client/src/network-ui/extract_messages.js
+++ b/awx/ui/client/src/network-ui/extract_messages.js
@@ -54,4 +54,4 @@ while(next_message !== undefined) {
 }
 
 
-console.log(YAML.stringify(data));
+controller.log.debug(YAML.stringify(data));
diff --git a/awx/ui/client/src/network-ui/fsm.js b/awx/ui/client/src/network-ui/fsm.js
index ffd833623d..3d43531c79 100644
--- a/awx/ui/client/src/network-ui/fsm.js
+++ b/awx/ui/client/src/network-ui/fsm.js
@@ -22,7 +22,7 @@ function NullChannel(from_controller, tracer) {
 NullChannel.prototype.send = function() {
 };
 
-function FSMController (scope, name, initial_state, tracer) {
+function FSMController (scope, name, initial_state, tracer, log) {
     this.scope = scope;
     this.name = name;
     this.state = initial_state;
@@ -32,6 +32,7 @@ function FSMController (scope, name, initial_state, tracer) {
     this.handling_message_type = 'start';
     this.state.start(this);
     this.handling_message_type = null;
+    this.log = log; 
 }
 exports.FSMController = FSMController;
 
diff --git a/awx/ui/client/src/network-ui/move.fsm.js b/awx/ui/client/src/network-ui/move.fsm.js
index 6744d8a91e..eaa72bab15 100644
--- a/awx/ui/client/src/network-ui/move.fsm.js
+++ b/awx/ui/client/src/network-ui/move.fsm.js
@@ -174,7 +174,7 @@ _Ready.prototype.onPasteDevice = function (controller, msg_type, message) {
     }
     scope.selected_devices.push(device);
     device.selected = true;
-    console.log(c_messages);
+    controller.log.debug(c_messages);
     scope.$emit('awxNet-addSearchOption', device);
     scope.send_control_message(new messages.MultipleMessage(controller.scope.client_id, c_messages));
     controller.changeState(Selected2);
diff --git a/awx/ui/client/src/network-ui/network.ui.app.js b/awx/ui/client/src/network-ui/network.ui.app.js
index 3da725f7ff..9ebe5f32f9 100644
--- a/awx/ui/client/src/network-ui/network.ui.app.js
+++ b/awx/ui/client/src/network-ui/network.ui.app.js
@@ -5,7 +5,6 @@ import networkDetailsDirective from './network-details/main';
 import networkZoomWidget from './zoom-widget/main';
 import awxNetStrings from './network.ui.strings';
 
-//console.log = function () { };
 var NetworkUIController = require('./network.ui.controller.js');
 var cursor = require('./cursor.directive.js');
 var router = require('./router.directive.js');
diff --git a/awx/ui/client/src/network-ui/network.ui.controller.js b/awx/ui/client/src/network-ui/network.ui.controller.js
index a207471da6..8f9a8ae240 100644
--- a/awx/ui/client/src/network-ui/network.ui.controller.js
+++ b/awx/ui/client/src/network-ui/network.ui.controller.js
@@ -194,17 +194,17 @@ var NetworkUIController = function($scope,
     };
 
   //Define the FSMs
-  $scope.hotkeys_controller = new fsm.FSMController($scope, "hotkeys_fsm", hotkeys.Start, $scope);
-  $scope.keybindings_controller = new fsm.FSMController($scope, "keybindings_fsm", keybindings.Start, $scope);
-  $scope.view_controller = new fsm.FSMController($scope, "view_fsm", view.Start, $scope);
-  $scope.move_controller = new fsm.FSMController($scope, "move_fsm", move.Start, $scope);
-  $scope.move_readonly_controller = new fsm.FSMController($scope, "move_readonly_fsm", move_readonly.Start, $scope);
-  $scope.details_panel_controller = new fsm.FSMController($scope, "details_panel_fsm", details_panel_fsm.Start, $scope);
-  $scope.buttons_controller = new fsm.FSMController($scope, "buttons_fsm", buttons.Start, $scope);
-  $scope.time_controller = new fsm.FSMController($scope, "time_fsm", time.Start, $scope);
-  $scope.test_controller = new fsm.FSMController($scope, "test_fsm", test_fsm.Start, $scope);
+  $scope.hotkeys_controller = new fsm.FSMController($scope, "hotkeys_fsm", hotkeys.Start, $scope, $log);
+  $scope.keybindings_controller = new fsm.FSMController($scope, "keybindings_fsm", keybindings.Start, $scope, $log);
+  $scope.view_controller = new fsm.FSMController($scope, "view_fsm", view.Start, $scope, $log);
+  $scope.move_controller = new fsm.FSMController($scope, "move_fsm", move.Start, $scope, $log);
+  $scope.move_readonly_controller = new fsm.FSMController($scope, "move_readonly_fsm", move_readonly.Start, $scope, $log);
+  $scope.details_panel_controller = new fsm.FSMController($scope, "details_panel_fsm", details_panel_fsm.Start, $scope, $log);
+  $scope.buttons_controller = new fsm.FSMController($scope, "buttons_fsm", buttons.Start, $scope, $log);
+  $scope.time_controller = new fsm.FSMController($scope, "time_fsm", time.Start, $scope, $log);
+  $scope.test_controller = new fsm.FSMController($scope, "test_fsm", test_fsm.Start, $scope, $log);
 
-  $scope.inventory_toolbox_controller = new fsm.FSMController($scope, "toolbox_fsm", toolbox_fsm.Start, $scope);
+  $scope.inventory_toolbox_controller = new fsm.FSMController($scope, "toolbox_fsm", toolbox_fsm.Start, $scope, $log);
 
   var toolboxTopMargin = $('.Networking-top').height();
   var toolboxTitleMargin = toolboxTopMargin + 35;
diff --git a/awx/ui/client/src/network-ui/test.fsm.js b/awx/ui/client/src/network-ui/test.fsm.js
index 4867e92f59..8e0b19a6aa 100644
--- a/awx/ui/client/src/network-ui/test.fsm.js
+++ b/awx/ui/client/src/network-ui/test.fsm.js
@@ -117,7 +117,7 @@ _Reporting.prototype.start = function (controller) {
                                         new Date().toISOString(),
                                         controller.scope.version);
     controller.scope.test_results.push(test_result);
-    console.log(["Reporting test", test_result.name, test_result.id]);
+    controller.log.debug(["Reporting test", test_result.name, test_result.id]);
     controller.scope.send_test_message(new messages.TestResult(controller.scope.client_id,
                                                                test_result.id,
                                                                test_result.name,
@@ -125,7 +125,7 @@ _Reporting.prototype.start = function (controller) {
                                                                test_result.date,
                                                                test_result.code_under_test));
     if (typeof(window.__coverage__) !== "undefined" && window.__coverage__ !== null) {
-        console.log(["Reporting coverage", test_result.name, test_result.id]);
+        controller.log.debug(["Reporting coverage", test_result.name, test_result.id]);
         controller.scope.send_test_message(new messages.Coverage(controller.scope.client_id, window.__coverage__, test_result.id));
     }
     controller.changeState(Loading);
@@ -138,7 +138,7 @@ _Loading.prototype.start = function (controller) {
     if (controller.scope.current_tests.length === 0) {
         controller.changeState(Disabled);
     } else {
-        console.log("Starting test");
+        controller.log.debug("Starting test");
         controller.scope.reset_coverage();
         controller.scope.current_test = controller.scope.current_tests.shift();
         controller.scope.reset_toolboxes();
@@ -169,7 +169,7 @@ _Ready.prototype.start = function (controller) {
 
     var load_id = controller.scope.test_result_id_seq();
 
-    console.log(["Reporting Load", load_id]);
+    controller.log.debug(["Reporting Load", load_id]);
     controller.scope.send_test_message(new messages.TestResult(controller.scope.client_id,
                                                                load_id,
                                                                "Load",
@@ -177,7 +177,7 @@ _Ready.prototype.start = function (controller) {
                                                                new Date().toISOString(),
                                                                controller.scope.version));
     if (typeof(window.__coverage__) !== "undefined" && window.__coverage__ !== null) {
-        console.log(["Reporting Load Coverage", load_id]);
+        controller.log.debug(["Reporting Load Coverage", load_id]);
         controller.scope.send_test_message(new messages.Coverage(controller.scope.client_id, window.__coverage__, load_id));
     }
 
diff --git a/awx/ui/client/src/network-ui/vendor/svg-crowbar.js b/awx/ui/client/src/network-ui/vendor/svg-crowbar.js
index bba3093801..fd9e242eaf 100644
--- a/awx/ui/client/src/network-ui/vendor/svg-crowbar.js
+++ b/awx/ui/client/src/network-ui/vendor/svg-crowbar.js
@@ -30,7 +30,7 @@ function svg_crowbar () {
           documents.push(el.contentDocument);
         }
       } catch(err) {
-        console.log(err);
+        controller.log.debug(err);
       }
     });
 
@@ -40,7 +40,7 @@ function svg_crowbar () {
           documents.push(el.contentDocument);
         }
       } catch(err) {
-        console.log(err);
+        controller.log.debug(err);
       }
     });
 
@@ -124,7 +124,7 @@ function svg_crowbar () {
       button.textContent = "Download";
 
       button.onclick = function() {
-        // console.log(el, d, i, sources)
+        // controller.log.debug(el, d, i, sources)
         download(d);
       };
 
diff --git a/awx/ui/client/src/shared/socket/socket.service.js b/awx/ui/client/src/shared/socket/socket.service.js
index f58c2d6928..f8db80b977 100644
--- a/awx/ui/client/src/shared/socket/socket.service.js
+++ b/awx/ui/client/src/shared/socket/socket.service.js
@@ -150,7 +150,7 @@ export default
                 if(this.socket){
                     this.socket.close();
                     delete this.socket;
-                    console.log("Socket deleted: "+this.socket);
+                    $log.debug("Socket deleted: "+this.socket);
                 }
             },
             subscribe: function(state){