Strip out more headers