Tidy up dependencies in pom files