Remove some unneeded headers