Also cleaned up "header" handling.
Removed print_header function which was doing two different things and
 misused in some places.

issue #6038