Fix header set and remove