More cleanup of deployment.