diff --git a/src/lines-component.coffee b/src/lines-component.coffee
index 951d5499a..547b54e56 100644
--- a/src/lines-component.coffee
+++ b/src/lines-component.coffee
@@ -118,56 +118,13 @@ class LinesComponent
 
   measureCharactersInNewLines: ->
     @presenter.batchCharacterMeasurement =>
-      for id, lineState of @oldState.lines
-        unless @measuredLines.has(id)
-          lineNode = @lineNodesByLineId[id]
-          @measureCharactersInLine(id, lineState, lineNode)
+      for id, component of @tileComponentsByTileId
+        component.measureCharactersInNewLines()
+
       return
 
-  measureCharactersInLine: (lineId, tokenizedLine, lineNode) ->
-    rangeForMeasurement = null
-    iterator = null
-    charIndex = 0
-
-    for {value, scopes, hasPairedCharacter} in tokenizedLine.tokens
-      charWidths = @presenter.getScopedCharacterWidths(scopes)
-
-      valueIndex = 0
-      while valueIndex < value.length
-        if hasPairedCharacter
-          char = value.substr(valueIndex, 2)
-          charLength = 2
-          valueIndex += 2
-        else
-          char = value[valueIndex]
-          charLength = 1
-          valueIndex++
-
-        continue if char is '\0'
-
-        unless charWidths[char]?
-          unless textNode?
-            rangeForMeasurement ?= document.createRange()
-            iterator =  document.createNodeIterator(lineNode, NodeFilter.SHOW_TEXT, AcceptFilter)
-            textNode = iterator.nextNode()
-            textNodeIndex = 0
-            nextTextNodeIndex = textNode.textContent.length
-
-          while nextTextNodeIndex <= charIndex
-            textNode = iterator.nextNode()
-            textNodeIndex = nextTextNodeIndex
-            nextTextNodeIndex = textNodeIndex + textNode.textContent.length
-
-          i = charIndex - textNodeIndex
-          rangeForMeasurement.setStart(textNode, i)
-          rangeForMeasurement.setEnd(textNode, i + charLength)
-          charWidth = rangeForMeasurement.getBoundingClientRect().width
-          @presenter.setScopedCharacterWidth(scopes, char, charWidth)
-
-        charIndex += charLength
-
-    @measuredLines.add(lineId)
-
   clearScopedCharWidths: ->
-    @measuredLines.clear()
+    for id, component of @tileComponentsByTileId
+      component.clearMeasurements()
+
     @presenter.clearScopedCharacterWidths()
diff --git a/src/tile-component.coffee b/src/tile-component.coffee
index 017856368..0b97467c7 100644
--- a/src/tile-component.coffee
+++ b/src/tile-component.coffee
@@ -2,9 +2,6 @@ _ = require 'underscore-plus'
 {toArray} = require 'underscore-plus'
 {$$} = require 'space-pen'
 
-CursorsComponent = require './cursors-component'
-HighlightsComponent = require './highlights-component'
-
 DummyLineNode = $$(-> @div className: 'line', style: 'position: absolute; visibility: hidden;', => @span 'x')[0]
 AcceptFilter = {acceptNode: -> NodeFilter.FILTER_ACCEPT}
 WrapperDiv = document.createElement('div')
@@ -219,7 +216,7 @@ class TileComponent
 
     if newLineState.top isnt oldLineState.top
       lineNode.style.top = newLineState.top + 'px'
-      oldLineState.top = newLineState.cop
+      oldLineState.top = newLineState.top
 
     if newLineState.screenRow isnt oldLineState.screenRow
       lineNode.dataset.screenRow = newLineState.screenRow
@@ -229,28 +226,12 @@ class TileComponent
   lineNodeForScreenRow: (screenRow) ->
     @lineNodesByLineId[@lineIdsByScreenRow[screenRow]]
 
-  measureLineHeightAndDefaultCharWidth: ->
-    @domNode.appendChild(DummyLineNode)
-    lineHeightInPixels = DummyLineNode.getBoundingClientRect().height
-    charWidth = DummyLineNode.firstChild.getBoundingClientRect().width
-    @domNode.removeChild(DummyLineNode)
-
-    @presenter.setLineHeight(lineHeightInPixels)
-    @presenter.setBaseCharacterWidth(charWidth)
-
-  remeasureCharacterWidths: ->
-    return unless @presenter.baseCharacterWidth
-
-    @clearScopedCharWidths()
-    @measureCharactersInNewLines()
-
   measureCharactersInNewLines: ->
-    @presenter.batchCharacterMeasurement =>
-      for id, lineState of @oldState.tiles[@id]?.lines
-        unless @measuredLines.has(id)
-          lineNode = @lineNodesByLineId[id]
-          @measureCharactersInLine(id, lineState, lineNode)
-      return
+    for id, lineState of @oldState.tiles[@id]?.lines
+      unless @measuredLines.has(id)
+        lineNode = @lineNodesByLineId[id]
+        @measureCharactersInLine(id, lineState, lineNode)
+    return
 
   measureCharactersInLine: (lineId, tokenizedLine, lineNode) ->
     rangeForMeasurement = null
@@ -296,6 +277,5 @@ class TileComponent
 
     @measuredLines.add(lineId)
 
-  clearScopedCharWidths: ->
+  clearMeasurements: ->
     @measuredLines.clear()
-    @presenter.clearScopedCharacterWidths()