cleanup
fixed undeploy procedure