cleanup for next wave of revisions