help: cleanup prior to rewrite