Removing unused classes