Cleanup pom.xml, use master pom