More cleanup for custodian.