Remove some unused headers