Further provisioning cleanup