Simplify and update pom.xml