Bug fix/centralizing remove attribute