Moved to Cypher 2.x syntax
Tidying up
Removing unused WHERE clause.