Cleanup, add header block.