diff --git a/applications/utilities/mesh/generation/Allwmake b/applications/utilities/mesh/generation/Allwmake
index 0869795ef8..4abbf97bc2 100755
--- a/applications/utilities/mesh/generation/Allwmake
+++ b/applications/utilities/mesh/generation/Allwmake
@@ -8,10 +8,6 @@ wmake -all $targetType extrude
 wmake -all $targetType extrude2DMesh
 wmake -all $targetType snappyHexMesh
 
-if [ -n "$FOAMY_HEX_MESH" ]
-then
-    foamyMesh/Allwmake $targetType $*
-fi
-
+foamyMesh/Allwmake $targetType $*
 
 #------------------------------------------------------------------------------
diff --git a/etc/bashrc b/etc/bashrc
index 84e38d9e7e..fad4f475ae 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -173,10 +173,7 @@ _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/paraview`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/ensight`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/gperftools`
 
-if [ ! -z "$FOAMY_HEX_MESH" ]
-then
-    _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/CGAL`
-fi
+_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/CGAL`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/scotch`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/FFTW`
 
diff --git a/etc/config.csh/unset b/etc/config.csh/unset
index bc077f20f8..7194f4853c 100644
--- a/etc/config.csh/unset
+++ b/etc/config.csh/unset
@@ -136,12 +136,6 @@ unsetenv GMP_ARCH_PATH
 unsetenv MPFR_ARCH_PATH
 unsetenv SCOTCH_ARCH_PATH
 
-#------------------------------------------------------------------------------
-# Unset foamyHexMesh-related environment variables
-
-unsetenv FOAMY_HEX_MESH
-
-
 #------------------------------------------------------------------------------
 # Cleanup environment
 # PATH, LD_LIBRARY_PATH, MANPATH
diff --git a/etc/config.sh/unset b/etc/config.sh/unset
index a0e6be5bc5..c51dcf4c53 100644
--- a/etc/config.sh/unset
+++ b/etc/config.sh/unset
@@ -132,12 +132,6 @@ unset GMP_ARCH_PATH
 unset MPFR_ARCH_PATH
 unset SCOTCH_ARCH_PATH
 
-#------------------------------------------------------------------------------
-# Unset foamyHexMesh-related environment variables
-
-unset FOAMY_HEX_MESH
-
-
 #------------------------------------------------------------------------------
 # Cleanup environment
 # PATH, LD_LIBRARY_PATH, MANPATH
diff --git a/etc/cshrc b/etc/cshrc
index 8f509b2839..759413c0c8 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -218,9 +218,7 @@ _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/mpi`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/paraview`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/ensight`
 
-if ( ($?FOAMY_HEX_MESH) ) then
-    _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/CGAL`
-endif
+_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/CGAL`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/FFTW`