Pom layout cleanup