cleanup & mavenize