Revert "HALO (1/2) - Cleanup"

This reverts commit 42186a8fd8e6f78c683a570699b7b212b410d218.
Revert