more header clean up