Cleanup - removed test files and commented code