Cleanup in pom.xml and plugin.yml