Removed unused or outdated header files