Removed unused header files