Remove all unused classes and clean up test class