Merge "Remove two obsolete files."