Move cleaning stuff up to the top level
Refactor everything; load using Cypher only