Removing END_SEGMENT and mid-stream HEADERS