remove unused class
uncommenting now working tests
organize imports
remove commented code
Merge branch 'cleanups'