Made a few improvements and removed provisioning section