remove references to moving header