Removing unused class properly