HALO cleanup & clearall-nap

Change-Id: I707213ef9574183ff891d26cf4187d172a14086e