Remove unused classes. Stop using others