Add undeploy support