       attributes = block.getAttributes()
       if attributes.bullet or attributes.number
         if block.isEmpty()
-          @removeCurrentAttribute(key) for key of block.getAttributes()
+          @removeBlockAttributes()
         else
           @insertBlockBreak()
       else

        switch
          # Remove block attributes
          when block.isEmpty()
            @removeCurrentAttribute(key) for key of block.getAttributes()
          # Break out of block after a newline (and remove the newline)
          when text.endsWithString("\n")
            @expandSelectionInDirection("backward")

      @document.removeTextAtLocationRange(locationRange)
      @setLocationRange(locationRange.collapse())

  removeBlockAttributes: ->
    range = @getLocationRange()
    block = @document.getBlockAtIndex(range.end.index)
    @removeCurrentAttribute(key) for key of block.getAttributes()

  # Current attributes

  hasCurrentAttribute: (attributeName) ->
