Merge "File header cleanup."