Cleanup + pom