Clean up, upgrade, mavenize
Clean up, upgrade, mavenize