Number of cleanups to the Python provisioning code