Eliminate dependecy on neo4j 1.1