removed unused classes and tests