Removed unnecessary headers