Header cleanup.