remove some extra header files to simplify things a little bit.