some more slight cleanup + removed a test class