diff --git a/etc/config.csh/mpi b/etc/config.csh/mpi
index 34280a12c9..ff21379258 100644
--- a/etc/config.csh/mpi
+++ b/etc/config.csh/mpi
@@ -261,7 +261,6 @@ if ( "$FOAM_MPI" != dummy ) then
 endif
 
 
-
 # Set the minimum MPI buffer size (used by all platforms except SGI MPI)
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 if ( ! $?minBufferSize ) set minBufferSize=20000000
@@ -274,4 +273,8 @@ else
     setenv MPI_BUFFER_SIZE $minBufferSize
 endif
 
+# Cleanup environment:
+# ~~~~~~~~~~~~~~~~~~~~
+unset minBufferSize
+
 #------------------------------------------------------------------------------
diff --git a/etc/config.csh/paraview b/etc/config.csh/paraview
index df5e680a34..12de70491b 100644
--- a/etc/config.csh/paraview
+++ b/etc/config.csh/paraview
@@ -25,7 +25,7 @@
 #     config.csh/paraview
 #
 # Description
-#     Setup file for paraview-[3-5].x
+#     Setup file for paraview
 #     Sourced from OpenFOAM-<VERSION>/etc/cshrc or from foamPV alias
 #
 # Note
@@ -49,10 +49,6 @@ foreach cmake ( cmake-3.2.1 cmake-2.8.12.1 cmake-2.8.8 cmake-2.8.4 cmake-2.8.3 c
 end
 
 #- ParaView version, automatically determine major version:
-#setenv ParaView_VERSION 3.12.0
-#setenv ParaView_VERSION 4.0.1
-#setenv ParaView_VERSION 4.1.0
-#setenv ParaView_VERSION 4.3.1
 #setenv ParaView_VERSION 4.4.0
 setenv ParaView_VERSION 5.0.1
 setenv ParaView_MAJOR detect
diff --git a/etc/config.csh/settings b/etc/config.csh/settings
index 592b71bbb3..ed6227d58d 100644
--- a/etc/config.csh/settings
+++ b/etc/config.csh/settings
@@ -308,7 +308,6 @@ endsw
 # Cleanup environment:
 # ~~~~~~~~~~~~~~~~~~~~
 #- keep _foamAddPath _foamAddLib _foamAddMan
-unset minBufferSize
 unsetenv WM_COMPILER_TYPE
 
 #------------------------------------------------------------------------------
diff --git a/etc/config.csh/unset b/etc/config.csh/unset
index 38bedd2874..c076d82e12 100644
--- a/etc/config.csh/unset
+++ b/etc/config.csh/unset
@@ -166,6 +166,7 @@ unalias wm32
 unalias wmSP
 unalias wmDP
 
+unalias wmREFRESH
 unalias wmUNSET
 
 unalias wmSchedON
diff --git a/etc/config.sh/aliases b/etc/config.sh/aliases
index 44de3c70b5..872cbf9c42 100644
--- a/etc/config.sh/aliases
+++ b/etc/config.sh/aliases
@@ -55,7 +55,7 @@ alias wmSchedOFF='unset WM_SCHEDULER'
 unset foamPV
 foamPV()
 {
-    . $WM_PROJECT_DIR/etc/config.sh/paraview ParaView_VERSION=$1
+    . $WM_PROJECT_DIR/etc/config.sh/paraview ParaView_VERSION=${1:-none}
     echo "paraview-$ParaView_VERSION  (major: $ParaView_MAJOR)" 1>&2
 }
 
diff --git a/etc/config.sh/mpi b/etc/config.sh/mpi
index 36b651e0fc..18c69af6ca 100644
--- a/etc/config.sh/mpi
+++ b/etc/config.sh/mpi
@@ -256,7 +256,6 @@ then
 fi
 
 
-
 # Set the minimum MPI buffer size (used by all platforms except SGI MPI)
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 : ${minBufferSize:=20000000}
diff --git a/etc/config.sh/paraview b/etc/config.sh/paraview
index aebfd5b889..71a5964c72 100644
--- a/etc/config.sh/paraview
+++ b/etc/config.sh/paraview
@@ -25,7 +25,7 @@
 #     etc/config.sh/paraview
 #
 # Description
-#     Setup file for paraview-[3-5].x
+#     Setup file for paraview
 #     Sourced from OpenFOAM-<VERSION>/etc/bashrc or from foamPV alias
 #
 # Note
@@ -57,10 +57,6 @@ done
 
 
 #- ParaView version, automatically determine major version
-#export ParaView_VERSION=3.12.0
-#export ParaView_VERSION=4.0.1
-#export ParaView_VERSION=4.1.0
-#export ParaView_VERSION=4.3.1
 #export ParaView_VERSION=4.4.0
 export ParaView_VERSION=5.0.1
 export ParaView_MAJOR=detect
diff --git a/etc/config.sh/unset b/etc/config.sh/unset
index af44571f03..7a8ee309a9 100644
--- a/etc/config.sh/unset
+++ b/etc/config.sh/unset
@@ -145,6 +145,7 @@ unalias wm32
 unalias wmSP
 unalias wmDP
 
+unalias wmREFRESH
 unalias wmUNSET
 
 unalias wmSchedON