Cleaned up provisioning