Automated cleanup + let's try the pom thing again