Add: more admin cleanup