     atom.assert screenLinesCount is bufferLinesCount, "Display buffer line count out of sync with buffer", (error) ->
       error.metadata = {screenLinesCount, tokenizedLinesCount, bufferLinesCount}
 
-if Grim.includeDeprecatedAPIs
-  DisplayBuffer.properties
-    softWrapped: null
-    editorWidthInChars: null
-    lineHeightInPixels: null
-    defaultCharWidth: null
-    height: null
-    width: null
-    scrollTop: 0
-    scrollLeft: 0
-    scrollWidth: 0
-    verticalScrollbarWidth: 15
-    horizontalScrollbarHeight: 15
-
-  EmitterMixin = require('emissary').Emitter
-
-  DisplayBuffer::on = (eventName) ->
-    switch eventName
-      when 'changed'
-        Grim.deprecate("Use DisplayBuffer::onDidChange instead")
-      when 'grammar-changed'
-        Grim.deprecate("Use DisplayBuffer::onDidChangeGrammar instead")
-      when 'soft-wrap-changed'
-        Grim.deprecate("Use DisplayBuffer::onDidChangeSoftWrap instead")
-      when 'character-widths-changed'
-        Grim.deprecate("Use DisplayBuffer::onDidChangeCharacterWidths instead")
-      when 'decoration-added'
-        Grim.deprecate("Use DisplayBuffer::onDidAddDecoration instead")
-      when 'decoration-removed'
-        Grim.deprecate("Use DisplayBuffer::onDidRemoveDecoration instead")
-      when 'decoration-changed'
-        Grim.deprecate("Use decoration.getMarker().onDidChange() instead")
-      when 'decoration-updated'
-        Grim.deprecate("Use Decoration::onDidChangeProperties instead")
-      when 'marker-created'
-        Grim.deprecate("Use Decoration::onDidCreateMarker instead")
-      when 'markers-updated'
-        Grim.deprecate("Use Decoration::onDidUpdateMarkers instead")
-      else
-        Grim.deprecate("DisplayBuffer::on is deprecated. Use event subscription methods instead.")
-
-    EmitterMixin::on.apply(this, arguments)
-else
-  DisplayBuffer::softWrapped = null
-  DisplayBuffer::editorWidthInChars = null
-  DisplayBuffer::lineHeightInPixels = null
-  DisplayBuffer::defaultCharWidth = null
-  DisplayBuffer::height = null
-  DisplayBuffer::width = null
-  DisplayBuffer::scrollTop = 0
-  DisplayBuffer::scrollLeft = 0
-  DisplayBuffer::scrollWidth = 0
-  DisplayBuffer::verticalScrollbarWidth = 15
-  DisplayBuffer::horizontalScrollbarHeight = 15
+DisplayBuffer.properties
+  softWrapped: null
+  editorWidthInChars: null
+  lineHeightInPixels: null
+  defaultCharWidth: null
+  height: null
+  width: null
+  scrollTop: 0
+  scrollLeft: 0
+  scrollWidth: 0
+  verticalScrollbarWidth: 15
+  horizontalScrollbarHeight: 15

    @emitter.on 'did-update-markers', callback

  emitDidChange: (eventProperties, refreshMarkers=true) ->
    @emit 'changed', eventProperties if Grim.includeDeprecatedAPIs
    @emitter.emit 'did-change', eventProperties
    if refreshMarkers
      @refreshMarkerScreenPositions()
    @emit 'markers-updated' if Grim.includeDeprecatedAPIs
    @emitter.emit 'did-update-markers'

  updateWrappedScreenLines: ->

      @softWrapped = softWrapped
      @updateWrappedScreenLines()
      softWrapped = @isSoftWrapped()
      @emitter.emit 'did-change-soft-wrapped', softWrapped
      softWrapped
    else
