cleaning up the header as well