removed some unncessary headers