Clean up bootstrap provisioning issues