assoc remove and style refactoring according to spec