More Hdfrc and Auto sections cleanup