Get rid of deprecated headers