Cleanup, making sure you dont do stuff twice with provisionging