Add undeploy support, make it work