Fixing extra custodian removal