Overall clean-up of deployment script