some halo cleanups