Merge "Remove obsolete header file"