diff --git a/src/display-buffer.coffee b/src/display-buffer.coffee
index 2e94307b6..d374b909f 100644
--- a/src/display-buffer.coffee
+++ b/src/display-buffer.coffee
@@ -205,78 +205,15 @@ class DisplayBuffer extends Model
   setHeight: (@height) ->
     @height
 
-  getClientHeight: (reentrant) ->
-    @getHeight()
-
-  getClientWidth: (reentrant) ->
-    if @verticallyScrollable(reentrant)
-      @getWidth() - @getVerticalScrollbarWidth()
-    else
-      @getWidth()
-
-  horizontallyScrollable: (reentrant) ->
-    return false unless @width?
-    return false if @isSoftWrapped()
-    if reentrant
-      @getScrollWidth() > @getWidth()
-    else
-      @getScrollWidth() > @getClientWidth(true)
-
-  verticallyScrollable: (reentrant) ->
-    return false unless @height?
-    if reentrant
-      @getScrollHeight() > @getHeight()
-    else
-      @getScrollHeight() > @getClientHeight(true)
-
   getWidth: ->
-    if @width?
-      @width
-    else
-      if @verticallyScrollable()
-        @getScrollWidth() + @getVerticalScrollbarWidth()
-      else
-        @getScrollWidth()
+    @width or 0
 
   setWidth: (newWidth) ->
     oldWidth = @width
     @width = newWidth
     @updateWrappedScreenLines() if newWidth isnt oldWidth and @isSoftWrapped()
-    @setScrollTop(@getScrollTop()) # Ensure scrollTop is still valid in case horizontal scrollbar disappeared
     @width
 
-  getScrollTop: -> @scrollTop
-  setScrollTop: (scrollTop) ->
-    scrollTop = Math.round(Math.max(0, Math.min(@getMaxScrollTop(), scrollTop)))
-    unless scrollTop is @scrollTop
-      @scrollTop = scrollTop
-      @emitter.emit 'did-change-scroll-top', @scrollTop
-    @scrollTop
-
-  getMaxScrollTop: ->
-    @getScrollHeight() - @getClientHeight()
-
-  getScrollBottom: -> @scrollTop + @getClientHeight()
-  setScrollBottom: (scrollBottom) ->
-    @setScrollTop(scrollBottom - @getClientHeight())
-    @getScrollBottom()
-
-  getScrollLeft: -> @scrollLeft
-  setScrollLeft: (scrollLeft) ->
-    scrollLeft = Math.round(Math.max(0, Math.min(@getScrollWidth() - @getClientWidth(), scrollLeft)))
-    unless scrollLeft is @scrollLeft
-      @scrollLeft = scrollLeft
-      @emitter.emit 'did-change-scroll-left', @scrollLeft
-    @scrollLeft
-
-  getMaxScrollLeft: ->
-    @getScrollWidth() - @getClientWidth()
-
-  getScrollRight: -> @scrollLeft + @width
-  setScrollRight: (scrollRight) ->
-    @setScrollLeft(scrollRight - @width)
-    @getScrollRight()
-
   getLineHeightInPixels: -> @lineHeightInPixels
   setLineHeightInPixels: (@lineHeightInPixels) -> @lineHeightInPixels
 
@@ -284,7 +221,6 @@ class DisplayBuffer extends Model
   setDefaultCharWidth: (defaultCharWidth) ->
     if defaultCharWidth isnt @defaultCharWidth
       @defaultCharWidth = defaultCharWidth
-      @computeScrollWidth()
     defaultCharWidth
 
   getCursorWidth: -> 1
@@ -313,7 +249,6 @@ class DisplayBuffer extends Model
     @characterWidthsChanged() unless @batchingCharacterMeasurement
 
   characterWidthsChanged: ->
-    @computeScrollWidth()
     @emit 'character-widths-changed', @scopedCharacterWidthsChangeCount if Grim.includeDeprecatedAPIs
     @emitter.emit 'did-change-character-widths', @scopedCharacterWidthsChangeCount
 
@@ -400,8 +335,7 @@ class DisplayBuffer extends Model
 
   # Returns the editor width in characters for soft wrap.
   getEditorWidthInChars: ->
-    width = @width ? @getScrollWidth()
-    width -= @getVerticalScrollbarWidth()
+    width = @getWidth()
     if width? and @defaultCharWidth > 0
       Math.max(0, Math.floor(width / @defaultCharWidth))
     else
@@ -1128,7 +1062,6 @@ class DisplayBuffer extends Model
     @changeCount = @tokenizedBuffer.changeCount
     {start, end, delta, bufferChange} = tokenizedBufferChange
     @updateScreenLines(start, end + 1, delta, refreshMarkers: false)
-    @setScrollTop(Math.min(@getScrollTop(), @getMaxScrollTop())) if delta < 0
 
   updateScreenLines: (startBufferRow, endBufferRow, bufferDelta=0, options={}) ->
     return if @largeFileMode
@@ -1233,13 +1166,6 @@ class DisplayBuffer extends Model
         @longestScreenRow = screenRow
         @maxLineLength = length
 
-    @computeScrollWidth() if oldMaxLineLength isnt @maxLineLength
-
-  computeScrollWidth: ->
-    @scrollWidth = @pixelPositionForScreenPosition([@longestScreenRow, @maxLineLength]).left
-    @scrollWidth += 1 unless @isSoftWrapped()
-    @setScrollLeft(Math.min(@getScrollLeft(), @getMaxScrollLeft()))
-
   handleBufferMarkerCreated: (textBufferMarker) =>
     if textBufferMarker.matchesParams(@getFoldMarkerAttributes())
       fold = new Fold(this, textBufferMarker)
diff --git a/src/text-editor-presenter.coffee b/src/text-editor-presenter.coffee
index c999b51de..c6ef81c3b 100644
--- a/src/text-editor-presenter.coffee
+++ b/src/text-editor-presenter.coffee
@@ -50,8 +50,6 @@ class TextEditorPresenter
     @emitter.emit "did-update-state" if @isBatching()
 
   transferMeasurementsToModel: ->
-    # @model.setHeight(@explicitHeight) if @explicitHeight?
-    @model.setWidth(@contentFrameWidth) if @contentFrameWidth?
     @model.setLineHeightInPixels(@lineHeight) if @lineHeight?
     @model.setDefaultCharWidth(@baseCharacterWidth) if @baseCharacterWidth?
 
@@ -679,6 +677,7 @@ class TextEditorPresenter
       @updateScrollHeight()
 
     if @contentWidth isnt oldContentWidth
+      @model.setWidth(Math.min(@clientWidth, @contentWidth))
       @updateScrollbarDimensions()
       @updateScrollWidth()
 
@@ -698,6 +697,7 @@ class TextEditorPresenter
     clientWidth = @contentFrameWidth - @verticalScrollbarWidth
     unless @clientWidth is clientWidth
       @clientWidth = clientWidth
+      @model.setWidth(Math.min(@clientWidth, @contentWidth))
       @updateScrollWidth()
       @updateScrollLeft()
 
@@ -944,7 +944,6 @@ class TextEditorPresenter
     unless @contentFrameWidth is contentFrameWidth
       oldContentFrameWidth = @contentFrameWidth
       @contentFrameWidth = contentFrameWidth
-      @model.setWidth(contentFrameWidth)
       @updateScrollbarDimensions()
       @updateClientWidth()
       @shouldUpdateVerticalScrollState = true