Halo code cleanup

Change-Id: I1f535eaac3496bb64ff417e9d05687324efd5723