more header removal/normalization