diff --git a/src/lines-tile-component.coffee b/src/lines-tile-component.coffee
index 3cc3accee..c9ecd0982 100644
--- a/src/lines-tile-component.coffee
+++ b/src/lines-tile-component.coffee
@@ -193,7 +193,7 @@ class LinesTileComponent
   screenRowForNode: (node) -> parseInt(node.dataset.screenRow)
 
   buildLineNode: (id) ->
-    {screenRow, decorationClasses} = @newTileState.lines[id]
+    {lineText, tagCodes, screenRow, decorationClasses} = @newTileState.lines[id]
 
     lineNode = @domElementPool.buildElement("div", "line")
     lineNode.dataset.screenRow = screenRow
@@ -202,57 +202,7 @@ class LinesTileComponent
       for decorationClass in decorationClasses
         lineNode.classList.add(decorationClass)
 
-    @currentLineTextNodes = []
-    # if words.length is 0
-    #   @setEmptyLineInnerNodes(id, lineNode)
-
-    @setLineInnerNodes(id, lineNode)
-    @textNodesByLineId[id] = @currentLineTextNodes
-
-    # lineNode.appendChild(@domElementPool.buildElement("span", "fold-marker")) if fold
-    lineNode
-
-  setEmptyLineInnerNodes: (id, lineNode) ->
-    {indentGuidesVisible} = @newState
-    {indentLevel, tabLength, endOfLineInvisibles} = @newTileState.lines[id]
-
-    if indentGuidesVisible and indentLevel > 0
-      invisibleIndex = 0
-      for i in [0...indentLevel]
-        indentGuide = @domElementPool.buildElement("span", "indent-guide")
-        for j in [0...tabLength]
-          if invisible = endOfLineInvisibles?[invisibleIndex++]
-            invisibleSpan = @domElementPool.buildElement("span", "invisible-character")
-            textNode = @domElementPool.buildText(invisible)
-            invisibleSpan.appendChild(textNode)
-            indentGuide.appendChild(invisibleSpan)
-
-            @currentLineTextNodes.push(textNode)
-          else
-            textNode = @domElementPool.buildText(" ")
-            indentGuide.appendChild(textNode)
-
-            @currentLineTextNodes.push(textNode)
-        lineNode.appendChild(indentGuide)
-
-      while invisibleIndex < endOfLineInvisibles?.length
-        invisible = endOfLineInvisibles[invisibleIndex++]
-        invisibleSpan = @domElementPool.buildElement("span", "invisible-character")
-        textNode = @domElementPool.buildText(invisible)
-        invisibleSpan.appendChild(textNode)
-        lineNode.appendChild(invisibleSpan)
-
-        @currentLineTextNodes.push(textNode)
-    else
-      unless @appendEndOfLineNodes(id, lineNode)
-        textNode = @domElementPool.buildText("\u00a0")
-        lineNode.appendChild(textNode)
-
-        @currentLineTextNodes.push(textNode)
-
-  setLineInnerNodes: (id, lineNode) ->
-    {lineText, tagCodes} = @newTileState.lines[id]
-
+    textNodes = []
     lineLength = 0
     startIndex = 0
     openScopeNode = lineNode
@@ -268,100 +218,15 @@ class LinesTileComponent
         textNode = @domElementPool.buildText(lineText.substr(startIndex, tagCode))
         startIndex += tagCode
         openScopeNode.appendChild(textNode)
-        @currentLineTextNodes.push(textNode)
+        textNodes.push(textNode)
 
     if startIndex is 0
       textNode = @domElementPool.buildText(' ')
       lineNode.appendChild(textNode)
-      @currentLineTextNodes.push(textNode)
+      textNodes.push(textNode)
 
-  appendTokenNodes: (tokenText, isHardTab, firstNonWhitespaceIndex, firstTrailingWhitespaceIndex, hasIndentGuide, hasInvisibleCharacters, scopeNode) ->
-    if isHardTab
-      textNode = @domElementPool.buildText(tokenText)
-      hardTabNode = @domElementPool.buildElement("span", "hard-tab")
-      hardTabNode.classList.add("leading-whitespace") if firstNonWhitespaceIndex?
-      hardTabNode.classList.add("trailing-whitespace") if firstTrailingWhitespaceIndex?
-      hardTabNode.classList.add("indent-guide") if hasIndentGuide
-      hardTabNode.classList.add("invisible-character") if hasInvisibleCharacters
-      hardTabNode.appendChild(textNode)
-
-      scopeNode.appendChild(hardTabNode)
-      @currentLineTextNodes.push(textNode)
-    else
-      startIndex = 0
-      endIndex = tokenText.length
-
-      leadingWhitespaceNode = null
-      leadingWhitespaceTextNode = null
-      trailingWhitespaceNode = null
-      trailingWhitespaceTextNode = null
-
-      if firstNonWhitespaceIndex?
-        leadingWhitespaceTextNode =
-          @domElementPool.buildText(tokenText.substring(0, firstNonWhitespaceIndex))
-        leadingWhitespaceNode = @domElementPool.buildElement("span", "leading-whitespace")
-        leadingWhitespaceNode.classList.add("indent-guide") if hasIndentGuide
-        leadingWhitespaceNode.classList.add("invisible-character") if hasInvisibleCharacters
-        leadingWhitespaceNode.appendChild(leadingWhitespaceTextNode)
-
-        startIndex = firstNonWhitespaceIndex
-
-      if firstTrailingWhitespaceIndex?
-        tokenIsOnlyWhitespace = firstTrailingWhitespaceIndex is 0
-
-        trailingWhitespaceTextNode =
-          @domElementPool.buildText(tokenText.substring(firstTrailingWhitespaceIndex))
-        trailingWhitespaceNode = @domElementPool.buildElement("span", "trailing-whitespace")
-        trailingWhitespaceNode.classList.add("indent-guide") if hasIndentGuide and not firstNonWhitespaceIndex? and tokenIsOnlyWhitespace
-        trailingWhitespaceNode.classList.add("invisible-character") if hasInvisibleCharacters
-        trailingWhitespaceNode.appendChild(trailingWhitespaceTextNode)
-
-        endIndex = firstTrailingWhitespaceIndex
-
-      if leadingWhitespaceNode?
-        scopeNode.appendChild(leadingWhitespaceNode)
-        @currentLineTextNodes.push(leadingWhitespaceTextNode)
-
-      if tokenText.length > MaxTokenLength
-        while startIndex < endIndex
-          textNode = @domElementPool.buildText(
-            @sliceText(tokenText, startIndex, startIndex + MaxTokenLength)
-          )
-          textSpan = @domElementPool.buildElement("span")
-
-          textSpan.appendChild(textNode)
-          scopeNode.appendChild(textSpan)
-          startIndex += MaxTokenLength
-          @currentLineTextNodes.push(textNode)
-      else
-        textNode = @domElementPool.buildText(@sliceText(tokenText, startIndex, endIndex))
-        scopeNode.appendChild(textNode)
-        @currentLineTextNodes.push(textNode)
-
-      if trailingWhitespaceNode?
-        scopeNode.appendChild(trailingWhitespaceNode)
-        @currentLineTextNodes.push(trailingWhitespaceTextNode)
-
-  sliceText: (tokenText, startIndex, endIndex) ->
-    if startIndex? and endIndex? and startIndex > 0 or endIndex < tokenText.length
-      tokenText = tokenText.slice(startIndex, endIndex)
-    tokenText
-
-  appendEndOfLineNodes: (id, lineNode) ->
-    {endOfLineInvisibles} = @newTileState.lines[id]
-
-    hasInvisibles = false
-    if endOfLineInvisibles?
-      for invisible in endOfLineInvisibles
-        hasInvisibles = true
-        invisibleSpan = @domElementPool.buildElement("span", "invisible-character")
-        textNode = @domElementPool.buildText(invisible)
-        invisibleSpan.appendChild(textNode)
-        lineNode.appendChild(invisibleSpan)
-
-        @currentLineTextNodes.push(textNode)
-
-    hasInvisibles
+    @textNodesByLineId[id] = textNodes
+    lineNode
 
   updateLineNode: (id) ->
     oldLineState = @oldTileState.lines[id]