Cleaned up in architecture header files.