remove unnecessary header files
remove references to header files