more admin cleanup