Moved some unused code to one class in the src/test/java tree
Cleanup