diff --git a/src/app/edit-session.coffee b/src/app/edit-session.coffee
index 0e3904942..5731eed1e 100644
--- a/src/app/edit-session.coffee
+++ b/src/app/edit-session.coffee
@@ -120,6 +120,9 @@ class EditSession
   outdentSelectedRows: ->
     @mutateSelectedText (selection) -> selection.outdentSelectedRows()
 
+  toggleCommentsInSelection: ->
+    @mutateSelectedText (selection) -> selection.toggleLineComments()
+
   cutToEndOfLine: ->
     maintainPasteboard = false
     @mutateSelectedText (selection) ->
diff --git a/src/app/editor.coffee b/src/app/editor.coffee
index 8d8417eae..0275070d5 100644
--- a/src/app/editor.coffee
+++ b/src/app/editor.coffee
@@ -157,9 +157,6 @@ class Editor extends View
   addCursorAtBufferPosition: (bufferPosition) ->
     @activeEditSession.addCursorAtBufferPosition(bufferPosition)
 
-  addSelectionForCursor: (cursor) ->
-    @compositeSelection.addSelectionForCursor(cursor)
-
   handleEvents: ->
     @on 'focus', =>
       @hiddenInput.focus()
@@ -366,7 +363,6 @@ class Editor extends View
     @unsubscribeFromBuffer() if @buffer
     @buffer = @activeEditSession.buffer
     @buffer.on "path-change.editor#{@id}", => @trigger 'editor-path-change'
-    @buffer.on "change.editor#{@id}", (e) => @handleBufferChange(e)
     @trigger 'editor-path-change'
 
     @renderer = @activeEditSession.renderer
@@ -455,9 +451,6 @@ class Editor extends View
   getLastVisibleScreenRow: ->
     Math.ceil((@scrollTop() + @scrollView.height()) / @lineHeight) - 1
 
-  handleBufferChange: (e) ->
-    # @compositeSelection.handleBufferChange(e)
-
   handleRendererChange: (e) ->
     oldScreenRange = e.oldRange
     newScreenRange = e.newRange
@@ -729,7 +722,7 @@ class Editor extends View
       else
         @insertText('\t')
     else
-      @compositeSelection.indentSelectedRows()
+      @activeEditSession.indentSelectedRows()
 
   indentSelectedRows: -> @activeEditSession.indentSelectedRows()
   outdentSelectedRows: -> @activeEditSession.outdentSelectedRows()
@@ -850,7 +843,7 @@ class Editor extends View
     @renderer.logLines(start, end)
 
   toggleLineCommentsInSelection: ->
-    @compositeSelection.toggleLineComments()
+    @activeEditSession.toggleLineCommentsInSelection()
 
   logRenderedLines: ->
     @renderedLines.find('.line').each (n) ->