diff --git a/etc/config.sh/bash_completion b/etc/config.sh/bash_completion
index 6413945984..e94432a043 100644
--- a/etc/config.sh/bash_completion
+++ b/etc/config.sh/bash_completion
@@ -1763,33 +1763,6 @@ _foamToVTK_ ()
 }
 complete -o filenames -o nospace -F _foamToVTK_ foamToVTK
 
-_foamUpgradeCyclics_ ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    local prev="${COMP_WORDS[COMP_CWORD-1]}"
-    local line=${COMP_LINE}
-    local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ")
-
-    opts="-case -constant -doc -enableFunctionEntries -fileHandler -help -hostRoots -latestTime -newTimes -noFunctionObjects -noZero -parallel -region -roots -srcDoc -test -time"
-    for o in $used ; do opts="${opts/$o/}" ; done
-    extra=""
-
-    [ "$COMP_CWORD" = 1 ] || \
-    case "$prev" in
-        -case)
-            opts="" ; extra="-d" ;;
-        -fileHandler)
-            opts="uncollated collated masterUncollated" ; extra="" ;;
-        -time)
-            opts="$(foamListTimes -withZero 2> /dev/null)" ; extra="" ;;
-        -hostRoots|-region|-roots)
-            opts="" ; extra="" ;;
-       *) ;;
-    esac
-    COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) )
-}
-complete -o filenames -o nospace -F _foamUpgradeCyclics_ foamUpgradeCyclics
-
 _foamyHexMesh_ ()
 {
     local cur="${COMP_WORDS[COMP_CWORD]}"
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
index 08b5954dcf..9c3ffac952 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -166,7 +166,6 @@ readField
         }
     }
 
-
     // Check for any unset patches
     forAll(bmesh_, patchi)
     {
@@ -178,10 +177,7 @@ readField
                 (
                     dict
                 )   << "Cannot find patchField entry for cyclic "
-                    << bmesh_[patchi].name() << endl
-                    << "Is your field uptodate with split cyclics?" << endl
-                    << "Run foamUpgradeCyclics to convert mesh and fields"
-                    << " to split cyclics." << exit(FatalIOError);
+                    << bmesh_[patchi].name() << endl << exit(FatalIOError);
             }
             else
             {
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
index 9e8fa97256..e3314f226e 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
@@ -217,9 +217,7 @@ Foam::cyclicPolyPatch::cyclicPolyPatch
         (
             dict
         )   << "No \"neighbourPatch\" provided." << endl
-            << "Is your mesh uptodate with split cyclics?" << endl
-            << "Run foamUpgradeCyclics to convert mesh and fields"
-            << " to split cyclics." << exit(FatalIOError);
+            << exit(FatalIOError);
     }
 
     if (nbrPatchName_ == name)