Final Refactoring, Removed neo4j library