refactoring
cleaning up unused methods and tests