removed unnecessary classes and unused use statements