Tidying up provisioning/deployment so it can be run without errors