HALO CLEAN UP

Change-Id: If7bebdf0e55117f55c12278e5ee67849d46f6e71