removed unnecessary classes and imports