Some Header cleanup.