More cleanup to HDFRC section