Added undeployment feature