Removed some obvious non-headers from extra_headers