Cleanup + it.pom.xml