Removed unnecessary header calls