Remove MarkOptionalNodes, which is no longer needed
Removed tx.finish() warnings from Cypher
Merge pull request #1327 from systay/minor-cleanup

Minor cleanup of Cypher