More cleanup for header