Minor changes to order in which cleanup occurs at the end of a custodian run.