Removing unnecessary headers