header clean up