removing unnecessary classes and obselete tests