Revert "HALO tweaks and Fixes"

This reverts commit 60ee80141453ef5b902d432db4a9d8d666e9194e.