Removing uneeded classes and interfaces