Roved unused code
Updated HNHUi