Simplify deploy_key and initial undeploy_key