Provision: fix admin and cleanup