remove traits class, all tests pass
Functor
remove traits from remaining classes
remove old test case