Remove unused code
Cleanup and remove test files