diff --git a/etc/bashrc b/etc/bashrc
index 218880e31193f8282a4eaf229e08a31c34c774b9..0c460577e92c7aeece4bb225fbb58db8b84072fd 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -33,8 +33,7 @@
 #------------------------------------------------------------------------------
 
 export WM_PROJECT=OpenFOAM
-# export WM_PROJECT_VERSION=1.6.x
-: ${WM_PROJECT_VERSION:=dev}; export WM_PROJECT_VERSION
+export WM_PROJECT_VERSION=1.6
 
 ################################################################################
 # USER EDITABLE PART
@@ -102,9 +101,6 @@ export WM_COMPILER_LIB_ARCH=
 # WM_COMPILE_OPTION = Opt | Debug | Prof
 : ${WM_COMPILE_OPTION:=Opt}; export WM_COMPILE_OPTION
 
-# WM_JAVAC_OPTION = Opt | Debug
-: ${WM_JAVAC_OPTION:=Opt}; export WM_JAVAC_OPTION
-
 # WM_MPLIB = | OPENMPI | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI
 : ${WM_MPLIB:=OPENMPI}; export WM_MPLIB
 
diff --git a/etc/cshrc b/etc/cshrc
index 0ead9b1a65f5769b91b9539ee52862970a8dc78c..bc5f325dd649403651d998df0b9cf7dfeedca334 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -32,8 +32,7 @@
 #------------------------------------------------------------------------------
 
 setenv WM_PROJECT OpenFOAM
-# setenv WM_PROJECT_VERSION 1.6.x
-if ( ! $?WM_PROJECT_VERSION ) setenv WM_PROJECT_VERSION dev
+setenv WM_PROJECT_VERSION 1.6
 
 ################################################################################
 # USER EDITABLE PART
@@ -96,9 +95,6 @@ if ( ! $?WM_PRECISION_OPTION ) setenv WM_PRECISION_OPTION DP
 # WM_COMPILE_OPTION = Opt | Debug | Prof
 if ( ! $?WM_COMPILE_OPTION ) setenv WM_COMPILE_OPTION Opt
 
-# WM_JAVAC_OPTION = Opt | Debug
-if ( ! $?WM_JAVAC_OPTION ) setenv WM_JAVAC_OPTION Opt
-
 # WM_MPLIB = | OPENMPI | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI
 if ( ! $?WM_MPLIB ) setenv WM_MPLIB OPENMPI