More HIG cleanups