Refine the code to remove the hfile link handling.