more headers clean up