Removed unnecessary classes and interfaces