finished testing refactored code
removed old, unused methods