remove old code from headers