cleaned up tests and removed unused code