Finish removal of header file