awr: header clean-up