Remove unnecessary headers