Further clean up, also in main pom