HALO cleanup & clearall-nap

Change-Id: Idd0d24cc3729fb6d966ac4df21e76636bd93fcb9