Major cleanup of pom files