diff --git a/etc/bashrc b/etc/bashrc
index 0fa2c231745906423c3db653398c875500851d71..98c22772cf2e5ac6fa171da6fc1d7ed8f1a6e01d 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -105,8 +105,8 @@ export FOAM_SIGFPE=
 ################################################################################
 
 # The old dirs to be cleaned from the environment variables
-foamOldDirs="$WM_PROJECT_DIR $WM_THIRD_PARTY_DIR \
-    $WM_PROJECT_SITE $HOME/$WM_PROJECT/$USER"
+foamOldDirs="$WM_PROJECT_DIR $WM_THIRD_PARTY_DIR $HOME/$WM_PROJECT/$USER \
+    $WM_PROJECT_SITE $FOAM_SITE_APPBIN $FOAM_SITE_LIBBIN"
 
 # Location of installation
 # ~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/etc/config.csh/unset b/etc/config.csh/unset
index c2a127a4b8b3f22d1b7a17d629ba20f6ed8f7f1c..bdebc037666ddc42be42ebe8d336ff2c51faadbf 100644
--- a/etc/config.csh/unset
+++ b/etc/config.csh/unset
@@ -37,23 +37,10 @@ if ( $?WM_PROJECT_DIR ) then
     if ( ! -f "$foamClean" || ! -x "$foamClean" ) unset foamClean
 endif
 
-set foamOldDirs=""
-
-# The old dirs to be cleaned from the various environment variables
-# - remove anything under top-level directory.
-# NB: the WM_PROJECT_INST_DIR might not be identical between versions
-#
-if ( $?WM_PROJECT_INST_DIR ) then
-    set foamOldDirs="$WM_PROJECT_INST_DIR"
-endif
-
-if ( $?WM_PROJECT ) then
-    set foamOldDirs="$HOME/$WM_PROJECT/$LOGNAME $foamOldDirs"
-endif
-
-if ( $?WM_PROJECT_SITE ) then
-    set foamOldDirs="$WM_PROJECT_SITE $foamOldDirs"
-endif
+# The old dirs to be cleaned from the environment variables
+set foamOldDirs="$WM_PROJECT_DIR $WM_THIRD_PARTY_DIR \
+    $HOME/$WM_PROJECT/$LOGNAME $WM_PROJECT_SITE \
+    $FOAM_SITE_APPBIN $FOAM_SITE_LIBBIN $ParaView_DIR"
 
 
 #------------------------------------------------------------------------------
@@ -64,12 +51,15 @@ unsetenv WM_ARCH_OPTION
 unsetenv WM_CC
 unsetenv WM_CFLAGS
 unsetenv WM_COMPILER
+unsetenv WM_COMPILER_TYPE
 unsetenv WM_COMPILER_LIB_ARCH
 unsetenv WM_COMPILE_OPTION
 unsetenv WM_CXX
 unsetenv WM_CXXFLAGS
 unsetenv WM_DIR
 unsetenv WM_HOSTS
+unsetenv WM_LABEL_OPTION
+unsetenv WM_LABEL_SIZE
 unsetenv WM_LDFLAGS
 unsetenv WM_LINK_LANGUAGE
 unsetenv WM_MPLIB
@@ -126,6 +116,8 @@ unsetenv ENSIGHT9_READER
 unsetenv CMAKE_HOME
 unsetenv ParaView_DIR
 unsetenv ParaView_INCLUDE_DIR
+unsetenv ParaView_MAJOR
+unsetenv ParaView_VERSION
 unsetenv PV_PLUGIN_PATH
 
 
diff --git a/etc/config.sh/unset b/etc/config.sh/unset
index 7b240eeb81947974d25c116a2126095fa56a362a..8e2b541b34bf0b960af8ac2b48faa5f33a8a8bf3 100644
--- a/etc/config.sh/unset
+++ b/etc/config.sh/unset
@@ -33,15 +33,9 @@
 foamClean=$WM_PROJECT_DIR/bin/foamCleanPath
 [ -f "$foamClean" -a -x "$foamClean" ] || unset foamClean
 
-# The old dirs to be cleaned from the various environment variables
-# - remove anything under top-level directory.
-# NB: the WM_PROJECT_INST_DIR might not be identical between versions
-#
-foamOldDirs="$WM_PROJECT_INST_DIR $WM_PROJECT_SITE"
-if [ -n "$WM_PROJECT" ]
-then
-    foamOldDirs="$foamOldDirs $HOME/$WM_PROJECT/$USER_SITE"
-fi
+# The old dirs to be cleaned from the environment variables
+foamOldDirs="$WM_PROJECT_DIR $WM_THIRD_PARTY_DIR $HOME/$WM_PROJECT/$USER \
+    $WM_PROJECT_SITE $FOAM_SITE_APPBIN $FOAM_SITE_LIBBIN $ParaView_DIR"
 
 #------------------------------------------------------------------------------
 # Unset WM_* environment variables
@@ -51,12 +45,15 @@ unset WM_ARCH_OPTION
 unset WM_CC
 unset WM_CFLAGS
 unset WM_COMPILER
+unset WM_COMPILER_TYPE
 unset WM_COMPILER_LIB_ARCH
 unset WM_COMPILE_OPTION
 unset WM_CXX
 unset WM_CXXFLAGS
 unset WM_DIR
 unset WM_HOSTS
+unset WM_LABEL_OPTION
+unset WM_LABEL_SIZE
 unset WM_LDFLAGS
 unset WM_LINK_LANGUAGE
 unset WM_MPLIB
@@ -113,6 +110,8 @@ unset ENSIGHT9_READER
 unset CMAKE_HOME
 unset ParaView_DIR
 unset ParaView_INCLUDE_DIR
+unset ParaView_MAJOR
+unset ParaView_VERSION
 unset PV_PLUGIN_PATH