changes to deploy & cleanup for different platforms/machines