Rationalize custodian code.
Rationalize custodian code.

specter119/custodian,alberthxf/custodian,materialsproject/custodian,davidwaroquiers/custodian,materialsproject/custodian,xhqu1981/custodian,specter119/custodian,materialsproject/custodian,specter119/custodian