Removed old and unused classes and interfaces since they are not used