mavenification, cleanup