Clean up code for provisioning