Small cleanup of hud add/remove code