Clean-up header includes