cypher cleanup