Revert "(HUD) Major Cleanup"

This reverts commit 0706c4a1db93b329b1f94d2020293f06db798b58.