This whole todo should be removed if you are no longer using Cypher