Cleanup of Cypher code

Removes code that handled patterns with optional relationships,
the type used pre-OPTIONAL MATCH.
Merge pull request #1394 from systay/cleanup

Cleanup of Cypher code