Clean up dependencies and pom.xml