Update POM to use new versions and cleanup