Switched to maven
Cleanup