HALO cleanup & clearall-nap

Change-Id: I05e45812fa10e3f6b3818ac4a96d94c7d0d5d125