Remove custom header and add generic header