Cleaning up excess (old) classes and packages