Removed unncessary headers