[#1071] Remove Attribute from map after Attribute.remove() was called