Cleaning up in preparation for token realignment