Added second cleanup mode for destroy