diff --git a/core/renderers/common/constants.js b/core/renderers/common/constants.js
index b21d5646a..b300d7de1 100644
--- a/core/renderers/common/constants.js
+++ b/core/renderers/common/constants.js
@@ -288,7 +288,6 @@ Blockly.blockRendering.ConstantProvider.prototype.makeNotch = function() {
           Blockly.utils.svgPaths.point(dir * outerWidth, -height)
         ]);
   }
-  // TODO: Find a relationship between width and path
   var pathLeft = makeMainPath(1);
   var pathRight = makeMainPath(-1);
 
diff --git a/core/renderers/common/info.js b/core/renderers/common/info.js
index 2819623d7..ce8ca9418 100644
--- a/core/renderers/common/info.js
+++ b/core/renderers/common/info.js
@@ -457,7 +457,6 @@ Blockly.blockRendering.RenderInfo.prototype.getInRowSpacing_ = function(prev, ne
 /**
  * Figure out where the right edge of the block and right edge of statement inputs
  * should be placed.
- * TODO: More cleanup.
  * @protected
  */
 Blockly.blockRendering.RenderInfo.prototype.computeBounds_ = function() {
@@ -476,9 +475,7 @@ Blockly.blockRendering.RenderInfo.prototype.computeBounds_ = function() {
         Math.max(widestRowWithConnectedBlocks, row.widthWithConnectedBlocks);
   }
 
-
   this.statementEdge = widestStatementRowFields;
-
   this.width = blockWidth;
 
   for (var i = 0, row; (row = this.rows[i]); i++) {
diff --git a/core/renderers/geras/highlighter.js b/core/renderers/geras/highlighter.js
index 7a49b6f4d..a740fe1cf 100644
--- a/core/renderers/geras/highlighter.js
+++ b/core/renderers/geras/highlighter.js
@@ -237,7 +237,6 @@ Blockly.geras.Highlighter.prototype.drawInlineInput = function(input) {
   var startY = yPos + offset;
 
   if (this.RTL_) {
-    // TODO: Check if this is different when the inline input is populated.
     var aboveTabHeight = input.connectionOffsetY - offset;
     var belowTabHeight = input.height -
         (input.connectionOffsetY + input.connectionHeight) + offset;
diff --git a/core/renderers/measurables/inputs.js b/core/renderers/measurables/inputs.js
index 5ff02a77b..2d44fd02b 100644
--- a/core/renderers/measurables/inputs.js
+++ b/core/renderers/measurables/inputs.js
@@ -61,7 +61,8 @@ Blockly.blockRendering.InputConnection = function(constants, input) {
     this.connectedBlockHeight = 0;
   }
 
-  // TODO: change references to connectionModel, since that's on Connection.
+  // TODO (#3186): change references to connectionModel, since that's on
+  // Connection.
   this.connection = input.connection;
   this.connectionOffsetX = 0;
   this.connectionOffsetY = 0;
diff --git a/core/renderers/measurables/rows.js b/core/renderers/measurables/rows.js
index 3783a0f4c..141ceb08a 100644
--- a/core/renderers/measurables/rows.js
+++ b/core/renderers/measurables/rows.js
@@ -166,7 +166,6 @@ Blockly.blockRendering.Row.prototype.measure = function() {
 
 /**
  * Get the last input on this row, if it has one.
- * TODO: Consider moving this to InputRow, if possible.
  * @return {Blockly.blockRendering.InputConnection} The last input on the row,
  *     or null.
  * @package
diff --git a/core/renderers/zelos/constants.js b/core/renderers/zelos/constants.js
index 66f06c47f..2c74a1a03 100644
--- a/core/renderers/zelos/constants.js
+++ b/core/renderers/zelos/constants.js
@@ -241,7 +241,6 @@ Blockly.zelos.ConstantProvider.prototype.makeNotch = function() {
     );
   }
 
-  // TODO: Find a relationship between width and path
   var pathLeft = makeMainPath(1);
   var pathRight = makeMainPath(-1);