Cleanup of Cypher code

Removes code that handled patterns with optional relationships,
the type used pre-OPTIONAL MATCH.