Clean up instantiation of CypherParser