minor cleanup and remove hlbsp support in qc extension list