diff --git a/src/octoprint/plugins/svgtogcode/static/js/working_area.js b/src/octoprint/plugins/svgtogcode/static/js/working_area.js
index b57d454d..bc567acb 100644
--- a/src/octoprint/plugins/svgtogcode/static/js/working_area.js
+++ b/src/octoprint/plugins/svgtogcode/static/js/working_area.js
@@ -690,7 +690,6 @@ $(function(){
 		};
 		
 		self.clear_gcode = function(){
-//			console.log("gcodeprev clear");
 			snap.select('#gCodePreview').clear();
 		};
 
diff --git a/src/octoprint/static/js/app/viewmodels/control.js b/src/octoprint/static/js/app/viewmodels/control.js
index 54f25015..e37aaef5 100644
--- a/src/octoprint/static/js/app/viewmodels/control.js
+++ b/src/octoprint/static/js/app/viewmodels/control.js
@@ -14,32 +14,6 @@ $(function() {
             }
         };
 
-//<<<<<<< HEAD
-//
-//    self.fromFeedbackCommandData = function(data) {
-//        if (data.name in self.feedbackControlLookup) {
-//            self.feedbackControlLookup[data.name](data.output);
-//        }
-//    };
-//
-
-//=======
-//<<<<<<< HEAD
-//        } else if (control.type == "feedback_command" || control.type == "feedback") {
-//            control.output = ko.observable("");
-//            self.feedbackControlLookup[control.name] = control.output;
-//        } else if (control.type == "section") {
-//            control.children = self._processControls(control.children);
-//        }
-//        return control;
-//    };
-//	
-
-//
-
-//
-
-//=======
 
         self.isErrorOrClosed = ko.observable(undefined);
         self.isOperational = ko.observable(undefined);
@@ -646,7 +620,7 @@ $(function() {
 					self.focus_off();
 					new PNotify({
 						title: gettext("Focus mode off"),
-						text: gettext("For safety reasons the focus mode was disabled after 30 seconds."),
+						text: gettext("For safety reasons the focus mode was disabled after 30 seconds.")
 					});
 				}, 30000);
 			};