Some tidying in the pom files