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

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

  # Current attributes

  hasCurrentAttribute: (attributeName) ->

      attributes = block.getAttributes()
      if attributes.bullet or attributes.number
        if block.isEmpty()
          @removeBlockAttributes()
        else
          @insertBlockBreak()
      else
