removed more headers