Removing last of the references to HF, to make this a more universal app