Class name cleans up after removing and replacing