Updated dependencies and cleaned up pom.xml