More header clean up