Cleaned up unused parts of the header files.