Clean up
Update pom.xml