Header cleanup