remove more deprecated and not very useful headers