Cleaned/homogenized up spec headers