Merge "Remove unused header file."