cleaning up provisioning and adding more tools