Code Cleanup, POM Update to neo4j 1.9.8