diff --git a/index.html b/index.html
index b4b3c030e..7d747614e 100755
--- a/index.html
+++ b/index.html
@@ -63,8 +63,6 @@ require(["dojo/_base/lang","dojo/dom-geometry","dojo/dom-class","dojo/on","dojo/
 	// Data is loaded and app ready to go
 
 	function styleLoaded() {
-		console.log("style loaded");
-
 		// Initialise drag-and-drop icons
 		new iD.ui.DragAndDrop("map",map,"dndgrid");
 
@@ -93,12 +91,10 @@ require(["dojo/_base/lang","dojo/dom-geometry","dojo/dom-class","dojo/on","dojo/
 	// Mode button handlers
 
 	enterWayMode=function() {
-		console.log('Second button was clicked!');
 		controller.setState(new iD.controller.shape.NoSelection());
 	};
 
 	enterEditMode=function() {
-		console.log('Third button was clicked!');
 	};
 	
 	finishClicked=function() {
@@ -122,7 +118,7 @@ require(["dojo/_base/lang","dojo/dom-geometry","dojo/dom-class","dojo/on","dojo/
      and http://dojotoolkit.org/widgets -->
 
 <div id="modebuttons" style="position:absolute; left: 10px; top: 10px;">
-	<div id="addPOI" data-dojo-type="dijit.form.DropDownButton" data-dojo-props="iconClass:'dijitIconApplication', onClick:function(){ console.log('First button was clicked!'); }">
+	<div id="addPOI" data-dojo-type="dijit.form.DropDownButton" data-dojo-props="iconClass:'dijitIconApplication', onClick:function(){}">
 		<span>Add point</span>
         <div data-dojo-type="dijit.TooltipDialog">
 			<p>Drag points onto the map</p>
diff --git a/js/iD/Connection.js b/js/iD/Connection.js
index ad5f35d00..afc13025b 100755
--- a/js/iD/Connection.js
+++ b/js/iD/Connection.js
@@ -26,7 +26,6 @@ declare("iD.Connection", null, {
 	constructor:function(apiURL) {
 		// summary:		The data store, including methods to fetch data from (and, eventually, save data to)
 		// 				an OSM API server.
-		console.log("Created a connection");
 		this.nodes={};
 		this.ways={};
 		this.relations={};
diff --git a/js/iD/controller/shape/DrawWay.js b/js/iD/controller/shape/DrawWay.js
index 38775f677..73029285d 100644
--- a/js/iD/controller/shape/DrawWay.js
+++ b/js/iD/controller/shape/DrawWay.js
@@ -108,7 +108,6 @@ declare("iD.controller.shape.DrawWay", [iD.controller.ControllerState], {
 
 				case 'way':
 					// Click on way, add new junction node to way
-					console.log("clicked a way, add new junction to way");
 					var ways=[entity];	// ** needs to find all the ways under the mouse
 					var undo=new iD.actions.CompositeUndoableAction();
 					var node=this.appendNewNode(event, undo);
@@ -119,7 +118,6 @@ declare("iD.controller.shape.DrawWay", [iD.controller.ControllerState], {
 		
 		} else if (event.type=='click') {
 			// Click on empty space, add new node to way
-			console.log("clicked empty space, add a new node to way");
 			var undo=new iD.actions.CompositeUndoableAction();
 			this.appendNewNode(event, undo);
 			var action=this.undoAdder(); action(undo);
diff --git a/js/iD/controller/shape/NoSelection.js b/js/iD/controller/shape/NoSelection.js
index 377f2f8e7..6c73e60a8 100644
--- a/js/iD/controller/shape/NoSelection.js
+++ b/js/iD/controller/shape/NoSelection.js
@@ -58,7 +58,6 @@ declare("iD.controller.shape.NoSelection", [iD.controller.ControllerState], {
 				default:
 					// Click to start a new way
 					var undo = new iD.actions.CompositeUndoableAction();
-					console.log("Event is ",event.type);
 					var startNode = this.getConnection().doCreateNode(
 						{}, 
 						map.coord2lat(map.mouseY(event)),
@@ -66,7 +65,6 @@ declare("iD.controller.shape.NoSelection", [iD.controller.ControllerState], {
 					var way = this.getConnection().doCreateWay({}, [startNode], lang.hitch(undo,undo.push) );
 					this.controller.undoStack.addAction(undo);
 					this.controller.map.createUI(way);
-					console.log("Started new way");
 					return new iD.controller.shape.DrawWay(way);
 			}
 		}