diff --git a/flang/docs/C++style.md b/flang/docs/C++style.md
--- a/flang/docs/C++style.md
+++ b/flang/docs/C++style.md
@@ -19,7 +19,7 @@
 * Use *clang-format*
 from llvm 7
 on all C++ source and header files before
-every merge to master.  All code layout should be determined
+every merge to main.  All code layout should be determined
 by means of clang-format.
 * Where a clear precedent exists in the project, follow it.
 * Otherwise, where [LLVM's C++ style guide](https://llvm.org/docs/CodingStandards.html#style-issues)
diff --git a/flang/docs/FortranIR.md b/flang/docs/FortranIR.md
--- a/flang/docs/FortranIR.md
+++ b/flang/docs/FortranIR.md
@@ -145,7 +145,7 @@
 
 _Program_: A program instance is the top-level object that contains the representation of all the code being compiled, the compilation unit. It contains a list of procedures and a reference to the global symbol table.
 
-_Procedure_: This is a named Fortran procedure (subroutine or function). It contains a (hierarchical) list of regions. It also owns the master list of all basic blocks for the procedure.
+_Procedure_: This is a named Fortran procedure (subroutine or function). It contains a (hierarchical) list of regions. It also owns a list of all basic blocks for the procedure.
 
 _Region_: A region is owned by a procedure or by another region. A region owns a reference to a scope in the symbol table tree. The list of delineated basic blocks can also be requested from a region.
 
diff --git a/flang/test/Lower/pre-fir-tree04.f90 b/flang/test/Lower/pre-fir-tree04.f90
--- a/flang/test/Lower/pre-fir-tree04.f90
+++ b/flang/test/Lower/pre-fir-tree04.f90
@@ -10,7 +10,6 @@
   type(lock_type) :: alock
   real :: y[10,*]
   integer :: counter[*]
-  logical :: is_master
   ! CHECK: <<ChangeTeamConstruct>>
   change team(t, x[5,*] => y)
     ! CHECK: AssignmentStmt