Remove unused class. Cleanup pom.xml