saner deployment + cleanup - phase I