Removing some unused headers