diff --git a/dispatch/bes/bes.conf.in b/dispatch/bes/bes.conf.in
index 53c87950a9..93198f269a 100644
--- a/dispatch/bes/bes.conf.in
+++ b/dispatch/bes/bes.conf.in
@@ -155,23 +155,6 @@ BES.ServerPort=10022
 
 # BES.DaemonPort=11002
 
-# Security information for this server. ServerSecure specifies whether
-# the server requires authentication by the client using SSL
-# certificates and keys. If ServerSecure is true/yes, then use
-# ServerSecurePort to set the port number and the subsequent six
-# parameters to set the server and client certificate, authentication
-# and key files.
-
-BES.ServerSecure=no
-
-# BES.ServerSecurePort=10003
-# BES.ServerCertFile=/full/path/to/serverside/certificate/file.pem
-# BES.ServerCertAuthFile=/full/path/to/serverside/certificate/authority/file.pem
-# BES.ServerKeyFile=/full/path/to/serverside/key/file.pem
-# BES.ClientCertFile=/full/path/to/clientside/certificate/file.pem
-# BES.ClientCertAuthFile=/full/path/to/clientside/certificate/authority/file.pem
-# BES.ClientKeyFile=/full/path/to/clientside/key/file.pem
-
 # Help file locations, for text, html, and xml versions
 
 BES.Help.TXT=@pkgdatadir@/bes_help.txt
diff --git a/modules/asciival/tests/bes.conf.modules.in b/modules/asciival/tests/bes.conf.modules.in
index a0d8722fe1..bdda3da57f 100644
--- a/modules/asciival/tests/bes.conf.modules.in
+++ b/modules/asciival/tests/bes.conf.modules.in
@@ -25,12 +25,7 @@ BES.FollowSymLinks=No
 BES.Catalog.catalog.FollowSymLinks=No
 
 BES.ServerPort=10002
-BES.ServerSecure=no
-BES.ServerSecurePort=10003
-BES.ServerCertFile=/full/path/to/serverside/certificate/file.pem
-BES.ServerKeyFile=/full/path/to/serverside/key/file.pem
-BES.ClientCertFile=/full/path/to/clientside/certificate/file.pem
-BES.ClientKeyFile=/full/path/to/clientside/key/file.pem
+
 BES.Help.TXT=@pkgdatadir@/bes_help.txt
 BES.Help.HTML=@pkgdatadir@/bes_help.html
 BES.Help.XML=@pkgdatadir@/bes_help.txt
diff --git a/modules/cmr_module/tests/bes.conf.in b/modules/cmr_module/tests/bes.conf.in
index 493165d7a7..70c4a156a4 100644
--- a/modules/cmr_module/tests/bes.conf.in
+++ b/modules/cmr_module/tests/bes.conf.in
@@ -32,13 +32,6 @@ BES.FollowSymLinks=No
 
 BES.ServerPort=10002
 
-BES.ServerSecure=no
-BES.ServerSecurePort=10003
-BES.ServerCertFile=/full/path/to/serverside/certificate/file.pem
-BES.ServerKeyFile=/full/path/to/serverside/key/file.pem
-BES.ClientCertFile=/full/path/to/clientside/certificate/file.pem
-BES.ClientKeyFile=/full/path/to/clientside/key/file.pem
-
 BES.Help.TXT=@pkgdatadir@/bes_help.txt
 BES.Help.HTML=@pkgdatadir@/bes_help.html
 BES.Help.XML=@pkgdatadir@/bes_help.txt
diff --git a/modules/debug_functions/tests/bes.conf.in b/modules/debug_functions/tests/bes.conf.in
index b0195a71ca..cde9b33e05 100644
--- a/modules/debug_functions/tests/bes.conf.in
+++ b/modules/debug_functions/tests/bes.conf.in
@@ -26,12 +26,6 @@ BES.FollowSymLinks=No
 BES.Catalog.catalog.FollowSymLinks=No
 
 BES.ServerPort=10002
-BES.ServerSecure=no
-BES.ServerSecurePort=10003
-BES.ServerCertFile=/full/path/to/serverside/certificate/file.pem
-BES.ServerKeyFile=/full/path/to/serverside/key/file.pem
-BES.ClientCertFile=/full/path/to/clientside/certificate/file.pem
-BES.ClientKeyFile=/full/path/to/clientside/key/file.pem
 
 BES.Help.TXT=@pkgdatadir@/bes_help.txt
 BES.Help.HTML=@pkgdatadir@/bes_help.html
diff --git a/modules/fileout_covjson/tests/bes.conf.in b/modules/fileout_covjson/tests/bes.conf.in
index 8fffb5ac68..13c606cd75 100644
--- a/modules/fileout_covjson/tests/bes.conf.in
+++ b/modules/fileout_covjson/tests/bes.conf.in
@@ -32,13 +32,6 @@ BES.Catalog.catalog.FollowSymLinks=Yes
 
 BES.ServerPort=10002
 
-BES.ServerSecure=no
-BES.ServerSecurePort=10003
-BES.ServerCertFile=/full/path/to/serverside/certificate/file.pem
-BES.ServerKeyFile=/full/path/to/serverside/key/file.pem
-BES.ClientCertFile=/full/path/to/clientside/certificate/file.pem
-BES.ClientKeyFile=/full/path/to/clientside/key/file.pem
-
 BES.Help.TXT=@pkgdatadir@/bes_help.txt
 BES.Help.HTML=@pkgdatadir@/bes_help.html
 BES.Help.XML=@pkgdatadir@/bes_help.txt
diff --git a/modules/fileout_covjson/tests/bes.default.conf.in b/modules/fileout_covjson/tests/bes.default.conf.in
index 88a76a97a0..7616fa03a5 100644
--- a/modules/fileout_covjson/tests/bes.default.conf.in
+++ b/modules/fileout_covjson/tests/bes.default.conf.in
@@ -32,13 +32,6 @@ BES.Catalog.catalog.FollowSymLinks=Yes
 
 BES.ServerPort=10002
 
-BES.ServerSecure=no
-BES.ServerSecurePort=10003
-BES.ServerCertFile=/full/path/to/serverside/certificate/file.pem
-BES.ServerKeyFile=/full/path/to/serverside/key/file.pem
-BES.ClientCertFile=/full/path/to/clientside/certificate/file.pem
-BES.ClientKeyFile=/full/path/to/clientside/key/file.pem
-
 BES.Help.TXT=@pkgdatadir@/bes_help.txt
 BES.Help.HTML=@pkgdatadir@/bes_help.html
 BES.Help.XML=@pkgdatadir@/bes_help.txt
diff --git a/modules/fileout_json/tests/bes.conf.in b/modules/fileout_json/tests/bes.conf.in
index 007c11d63b..5650d4500b 100644
--- a/modules/fileout_json/tests/bes.conf.in
+++ b/modules/fileout_json/tests/bes.conf.in
@@ -26,13 +26,6 @@ BES.Catalog.catalog.FollowSymLinks=No
 
 BES.ServerPort=10002
 
-BES.ServerSecure=no
-BES.ServerSecurePort=10003
-BES.ServerCertFile=/full/path/to/serverside/certificate/file.pem
-BES.ServerKeyFile=/full/path/to/serverside/key/file.pem
-BES.ClientCertFile=/full/path/to/clientside/certificate/file.pem
-BES.ClientKeyFile=/full/path/to/clientside/key/file.pem
-
 BES.Help.TXT=@pkgdatadir@/bes_help.txt
 BES.Help.HTML=@pkgdatadir@/bes_help.html
 BES.Help.XML=@pkgdatadir@/bes_help.txt
diff --git a/modules/fileout_json/tests/bes.conf.modules.in b/modules/fileout_json/tests/bes.conf.modules.in
index 1e961f01e0..1ad6b5efff 100644
--- a/modules/fileout_json/tests/bes.conf.modules.in
+++ b/modules/fileout_json/tests/bes.conf.modules.in
@@ -28,13 +28,6 @@ BES.Catalog.catalog.FollowSymLinks=No
 
 BES.ServerPort=10002
 
-BES.ServerSecure=no
-BES.ServerSecurePort=10003
-BES.ServerCertFile=/full/path/to/serverside/certificate/file.pem
-BES.ServerKeyFile=/full/path/to/serverside/key/file.pem
-BES.ClientCertFile=/full/path/to/clientside/certificate/file.pem
-BES.ClientKeyFile=/full/path/to/clientside/key/file.pem
-
 BES.Help.TXT=@pkgdatadir@/bes_help.txt
 BES.Help.HTML=@pkgdatadir@/bes_help.html
 BES.Help.XML=@pkgdatadir@/bes_help.txt
diff --git a/modules/fileout_netcdf/data/build_test_data/bes.conf.in b/modules/fileout_netcdf/data/build_test_data/bes.conf.in
index cef466ba31..7869f19fa5 100644
--- a/modules/fileout_netcdf/data/build_test_data/bes.conf.in
+++ b/modules/fileout_netcdf/data/build_test_data/bes.conf.in
@@ -146,21 +146,6 @@ BES.Catalog.catalog.FollowSymLinks=No
 BES.ServerPort=10002
 # BES.ServerUnixSocket=/tmp/bes.socket
 
-#-----------------------------------------------------------------------#
-# Security information for this server. ServerSecure specifies whether  #
-# the server is secure or not and requires authentication of the client #
-# using SSL certificates and keys. The default secure connection port   #
-# is 10003. Then specify the full path to the certificate and key files.#
-# An initialization file can be created for both the client and server  #
-# side.                                                                 #
-#-----------------------------------------------------------------------#
-BES.ServerSecure=no
-BES.ServerSecurePort=10003
-BES.ServerCertFile=/full/path/to/serverside/certificate/file.pem
-BES.ServerKeyFile=/full/path/to/serverside/key/file.pem
-BES.ClientCertFile=/full/path/to/clientside/certificate/file.pem
-BES.ClientKeyFile=/full/path/to/clientside/key/file.pem
-
 #-----------------------------------------------------------------------#
 # help file locations, for text, html, and xml versions                 #
 #-----------------------------------------------------------------------#
diff --git a/modules/fits_handler/tests/bes.conf.modules.in b/modules/fits_handler/tests/bes.conf.modules.in
index 15a0aa3db5..21257b2a41 100644
--- a/modules/fits_handler/tests/bes.conf.modules.in
+++ b/modules/fits_handler/tests/bes.conf.modules.in
@@ -27,13 +27,6 @@ BES.Catalog.catalog.FollowSymLinks=No
 
 BES.ServerPort=10002
 
-BES.ServerSecure=no
-BES.ServerSecurePort=10003
-BES.ServerCertFile=/full/path/to/serverside/certificate/file.pem
-BES.ServerKeyFile=/full/path/to/serverside/key/file.pem
-BES.ClientCertFile=/full/path/to/clientside/certificate/file.pem
-BES.ClientKeyFile=/full/path/to/clientside/key/file.pem
-
 BES.Help.TXT=@pkgdatadir@/bes_help.txt
 BES.Help.HTML=@pkgdatadir@/bes_help.html
 BES.Help.XML=@pkgdatadir@/bes_help.txt
diff --git a/modules/freeform_handler/tests/bes.conf.in b/modules/freeform_handler/tests/bes.conf.in
index b2b07edd4f..7ae7927c32 100644
--- a/modules/freeform_handler/tests/bes.conf.in
+++ b/modules/freeform_handler/tests/bes.conf.in
@@ -25,13 +25,6 @@ BES.Catalog.catalog.FollowSymLinks=No
 
 BES.ServerPort=10002
 
-BES.ServerSecure=no
-BES.ServerSecurePort=10003
-BES.ServerCertFile=/full/path/to/serverside/certificate/file.pem
-BES.ServerKeyFile=/full/path/to/serverside/key/file.pem
-BES.ClientCertFile=/full/path/to/clientside/certificate/file.pem
-BES.ClientKeyFile=/full/path/to/clientside/key/file.pem
-
 BES.Help.TXT=@pkgdatadir@/bes_help.txt
 BES.Help.HTML=@pkgdatadir@/bes_help.html
 BES.Help.XML=@pkgdatadir@/bes_help.txt
diff --git a/modules/hdf4_handler/bes-testsuite/bes.conf.in b/modules/hdf4_handler/bes-testsuite/bes.conf.in
index 4be67412f6..4f119bd173 100644
--- a/modules/hdf4_handler/bes-testsuite/bes.conf.in
+++ b/modules/hdf4_handler/bes-testsuite/bes.conf.in
@@ -146,21 +146,6 @@ BES.Catalog.catalog.FollowSymLinks=No
 BES.ServerPort=10002
 # BES.ServerUnixSocket=/tmp/bes.socket
 
-#-----------------------------------------------------------------------#
-# Security information for this server. ServerSecure specifies whether  #
-# the server is secure or not and requires authentication of the client #
-# using SSL certificates and keys. The default secure connection port   #
-# is 10003. Then specify the full path to the certificate and key files.#
-# An initialization file can be created for both the client and server  #
-# side.                                                                 #
-#-----------------------------------------------------------------------#
-BES.ServerSecure=no
-BES.ServerSecurePort=10003
-BES.ServerCertFile=/full/path/to/serverside/certificate/file.pem
-BES.ServerKeyFile=/full/path/to/serverside/key/file.pem
-BES.ClientCertFile=/full/path/to/clientside/certificate/file.pem
-BES.ClientKeyFile=/full/path/to/clientside/key/file.pem
-
 #-----------------------------------------------------------------------#
 # help file locations, for text, html, and xml versions                 #
 #-----------------------------------------------------------------------#
diff --git a/modules/hdf4_handler/bes-testsuite/bes.conf.modules.in b/modules/hdf4_handler/bes-testsuite/bes.conf.modules.in
index 91cab68a38..5f52a9f001 100644
--- a/modules/hdf4_handler/bes-testsuite/bes.conf.modules.in
+++ b/modules/hdf4_handler/bes-testsuite/bes.conf.modules.in
@@ -25,13 +25,6 @@ BES.Catalog.catalog.FollowSymLinks=Yes
 
 BES.ServerPort=10002
 
-BES.ServerSecure=no
-BES.ServerSecurePort=10003
-BES.ServerCertFile=/full/path/to/serverside/certificate/file.pem
-BES.ServerKeyFile=/full/path/to/serverside/key/file.pem
-BES.ClientCertFile=/full/path/to/clientside/certificate/file.pem
-BES.ClientKeyFile=/full/path/to/clientside/key/file.pem
-
 BES.Help.TXT=@pkgdatadir@/bes_help.txt
 BES.Help.HTML=@pkgdatadir@/bes_help.html
 BES.Help.XML=@pkgdatadir@/bes_help.txt
diff --git a/modules/hdf4_handler/bes-testsuite/bes.with_hdfeos2.conf.in b/modules/hdf4_handler/bes-testsuite/bes.with_hdfeos2.conf.in
index f89cadd5db..d3ae785b20 100644
--- a/modules/hdf4_handler/bes-testsuite/bes.with_hdfeos2.conf.in
+++ b/modules/hdf4_handler/bes-testsuite/bes.with_hdfeos2.conf.in
@@ -144,22 +144,8 @@ BES.Catalog.catalog.FollowSymLinks=Yes
 # that is the case, you should configure the BES to use SSL.            #
 #-----------------------------------------------------------------------#
 BES.ServerPort=10002
-# BES.ServerUnixSocket=/tmp/bes.socket
-
-#-----------------------------------------------------------------------#
-# Security information for this server. ServerSecure specifies whether  #
-# the server is secure or not and requires authentication of the client #
-# using SSL certificates and keys. The default secure connection port   #
-# is 10003. Then specify the full path to the certificate and key files.#
-# An initialization file can be created for both the client and server  #
-# side.                                                                 #
-#-----------------------------------------------------------------------#
 BES.ServerSecure=no
-BES.ServerSecurePort=10003
-BES.ServerCertFile=/full/path/to/serverside/certificate/file.pem
-BES.ServerKeyFile=/full/path/to/serverside/key/file.pem
-BES.ClientCertFile=/full/path/to/clientside/certificate/file.pem
-BES.ClientKeyFile=/full/path/to/clientside/key/file.pem
+# BES.ServerUnixSocket=/tmp/bes.socket
 
 #-----------------------------------------------------------------------#
 # help file locations, for text, html, and xml versions                 #
diff --git a/modules/hdf4_handler/bes-testsuite/bes.with_hdfeos2.conf.modules.in b/modules/hdf4_handler/bes-testsuite/bes.with_hdfeos2.conf.modules.in
index 339438449f..75f919f18e 100644
--- a/modules/hdf4_handler/bes-testsuite/bes.with_hdfeos2.conf.modules.in
+++ b/modules/hdf4_handler/bes-testsuite/bes.with_hdfeos2.conf.modules.in
@@ -24,15 +24,7 @@ BES.Catalog.catalog.Exclude=^\..*;
 BES.FollowSymLinks=Yes
 BES.Catalog.catalog.FollowSymLinks=Yes
 
-
-
 BES.ServerPort=10002
-BES.ServerSecure=no
-BES.ServerSecurePort=10003
-BES.ServerCertFile=/full/path/to/serverside/certificate/file.pem
-BES.ServerKeyFile=/full/path/to/serverside/key/file.pem
-BES.ClientCertFile=/full/path/to/clientside/certificate/file.pem
-BES.ClientKeyFile=/full/path/to/clientside/key/file.pem
 
 BES.Help.TXT=@pkgdatadir@/bes_help.txt
 BES.Help.HTML=@pkgdatadir@/bes_help.html
diff --git a/modules/hdf5_handler/bes-testsuite/bes.cfdmr.conf.in b/modules/hdf5_handler/bes-testsuite/bes.cfdmr.conf.in
index e765500ae1..ddbaaa5adc 100644
--- a/modules/hdf5_handler/bes-testsuite/bes.cfdmr.conf.in
+++ b/modules/hdf5_handler/bes-testsuite/bes.cfdmr.conf.in
@@ -148,21 +148,6 @@ BES.Catalog.catalog.FollowSymLinks=Yes
 BES.ServerPort=10002
 # BES.ServerUnixSocket=/tmp/bes.socket
 
-#-----------------------------------------------------------------------#
-# Security information for this server. ServerSecure specifies whether  #
-# the server is secure or not and requires authentication of the client #
-# using SSL certificates and keys. The default secure connection port   #
-# is 10003. Then specify the full path to the certificate and key files.#
-# An initialization file can be created for both the client and server  #
-# side.                                                                 #
-#-----------------------------------------------------------------------#
-BES.ServerSecure=no
-BES.ServerSecurePort=10003
-BES.ServerCertFile=/full/path/to/serverside/certificate/file.pem
-BES.ServerKeyFile=/full/path/to/serverside/key/file.pem
-BES.ClientCertFile=/full/path/to/clientside/certificate/file.pem
-BES.ClientKeyFile=/full/path/to/clientside/key/file.pem
-
 #-----------------------------------------------------------------------#
 # help file locations, for text, html, and xml versions                 #
 #-----------------------------------------------------------------------#
diff --git a/modules/hdf5_handler/bes-testsuite/bes.cfdmr.conf.modules.in b/modules/hdf5_handler/bes-testsuite/bes.cfdmr.conf.modules.in
index 19a9ad3ef3..7d8652b0a2 100644
--- a/modules/hdf5_handler/bes-testsuite/bes.cfdmr.conf.modules.in
+++ b/modules/hdf5_handler/bes-testsuite/bes.cfdmr.conf.modules.in
@@ -26,12 +26,7 @@ BES.FollowSymLinks=Yes
 BES.Catalog.catalog.FollowSymLinks=Yes
 
 BES.ServerPort=10002
-BES.ServerSecure=no
-BES.ServerSecurePort=10003
-BES.ServerCertFile=/full/path/to/serverside/certificate/file.pem
-BES.ServerKeyFile=/full/path/to/serverside/key/file.pem
-BES.ClientCertFile=/full/path/to/clientside/certificate/file.pem
-BES.ClientKeyFile=/full/path/to/clientside/key/file.pem
+
 BES.Help.TXT=@pkgdatadir@/bes_help.txt
 BES.Help.HTML=@pkgdatadir@/bes_help.html
 BES.Help.XML=@pkgdatadir@/bes_help.txt
diff --git a/modules/hdf5_handler/bes-testsuite/bes.conf.in b/modules/hdf5_handler/bes-testsuite/bes.conf.in
index 1587a99b29..1b0640b1aa 100644
--- a/modules/hdf5_handler/bes-testsuite/bes.conf.in
+++ b/modules/hdf5_handler/bes-testsuite/bes.conf.in
@@ -148,21 +148,6 @@ BES.Catalog.catalog.FollowSymLinks=Yes
 BES.ServerPort=10002
 # BES.ServerUnixSocket=/tmp/bes.socket
 
-#-----------------------------------------------------------------------#
-# Security information for this server. ServerSecure specifies whether  #
-# the server is secure or not and requires authentication of the client #
-# using SSL certificates and keys. The default secure connection port   #
-# is 10003. Then specify the full path to the certificate and key files.#
-# An initialization file can be created for both the client and server  #
-# side.                                                                 #
-#-----------------------------------------------------------------------#
-BES.ServerSecure=no
-BES.ServerSecurePort=10003
-BES.ServerCertFile=/full/path/to/serverside/certificate/file.pem
-BES.ServerKeyFile=/full/path/to/serverside/key/file.pem
-BES.ClientCertFile=/full/path/to/clientside/certificate/file.pem
-BES.ClientKeyFile=/full/path/to/clientside/key/file.pem
-
 #-----------------------------------------------------------------------#
 # help file locations, for text, html, and xml versions                 #
 #-----------------------------------------------------------------------#
diff --git a/modules/hdf5_handler/bes-testsuite/bes.conf.modules.in b/modules/hdf5_handler/bes-testsuite/bes.conf.modules.in
index 793757fcef..45d9e05c73 100644
--- a/modules/hdf5_handler/bes-testsuite/bes.conf.modules.in
+++ b/modules/hdf5_handler/bes-testsuite/bes.conf.modules.in
@@ -26,12 +26,7 @@ BES.FollowSymLinks=Yes
 BES.Catalog.catalog.FollowSymLinks=Yes
 
 BES.ServerPort=10002
-BES.ServerSecure=no
-BES.ServerSecurePort=10003
-BES.ServerCertFile=/full/path/to/serverside/certificate/file.pem
-BES.ServerKeyFile=/full/path/to/serverside/key/file.pem
-BES.ClientCertFile=/full/path/to/clientside/certificate/file.pem
-BES.ClientKeyFile=/full/path/to/clientside/key/file.pem
+
 BES.Help.TXT=@pkgdatadir@/bes_help.txt
 BES.Help.HTML=@pkgdatadir@/bes_help.html
 BES.Help.XML=@pkgdatadir@/bes_help.txt
diff --git a/modules/hdf5_handler/bes-testsuite/bes.default.conf.in b/modules/hdf5_handler/bes-testsuite/bes.default.conf.in
index c7471779b6..b5d427dff8 100644
--- a/modules/hdf5_handler/bes-testsuite/bes.default.conf.in
+++ b/modules/hdf5_handler/bes-testsuite/bes.default.conf.in
@@ -147,21 +147,6 @@ BES.Catalog.catalog.FollowSymLinks=Yes
 BES.ServerPort=10002
 # BES.ServerUnixSocket=/tmp/bes.socket
 
-#-----------------------------------------------------------------------#
-# Security information for this server. ServerSecure specifies whether  #
-# the server is secure or not and requires authentication of the client #
-# using SSL certificates and keys. The default secure connection port   #
-# is 10003. Then specify the full path to the certificate and key files.#
-# An initialization file can be created for both the client and server  #
-# side.                                                                 #
-#-----------------------------------------------------------------------#
-BES.ServerSecure=no
-BES.ServerSecurePort=10003
-BES.ServerCertFile=/full/path/to/serverside/certificate/file.pem
-BES.ServerKeyFile=/full/path/to/serverside/key/file.pem
-BES.ClientCertFile=/full/path/to/clientside/certificate/file.pem
-BES.ClientKeyFile=/full/path/to/clientside/key/file.pem
-
 #-----------------------------------------------------------------------#
 # help file locations, for text, html, and xml versions                 #
 #-----------------------------------------------------------------------#
diff --git a/modules/hdf5_handler/bes-testsuite/bes.default.conf.modules.in b/modules/hdf5_handler/bes-testsuite/bes.default.conf.modules.in
index f177040228..0745b3369e 100644
--- a/modules/hdf5_handler/bes-testsuite/bes.default.conf.modules.in
+++ b/modules/hdf5_handler/bes-testsuite/bes.default.conf.modules.in
@@ -26,12 +26,7 @@ BES.FollowSymLinks=Yes
 BES.Catalog.catalog.FollowSymLinks=Yes
 
 BES.ServerPort=10002
-BES.ServerSecure=no
-BES.ServerSecurePort=10003
-BES.ServerCertFile=/full/path/to/serverside/certificate/file.pem
-BES.ServerKeyFile=/full/path/to/serverside/key/file.pem
-BES.ClientCertFile=/full/path/to/clientside/certificate/file.pem
-BES.ClientKeyFile=/full/path/to/clientside/key/file.pem
+
 BES.Help.TXT=@pkgdatadir@/bes_help.txt
 BES.Help.HTML=@pkgdatadir@/bes_help.html
 BES.Help.XML=@pkgdatadir@/bes_help.txt
diff --git a/modules/hdf5_handler/bes-testsuite/bes.ignore.conf.in b/modules/hdf5_handler/bes-testsuite/bes.ignore.conf.in
index 6466e01788..2f3bc44dfc 100644
--- a/modules/hdf5_handler/bes-testsuite/bes.ignore.conf.in
+++ b/modules/hdf5_handler/bes-testsuite/bes.ignore.conf.in
@@ -146,21 +146,6 @@ BES.Catalog.catalog.FollowSymLinks=Yes
 BES.ServerPort=10002
 # BES.ServerUnixSocket=/tmp/bes.socket
 
-#-----------------------------------------------------------------------#
-# Security information for this server. ServerSecure specifies whether  #
-# the server is secure or not and requires authentication of the client #
-# using SSL certificates and keys. The default secure connection port   #
-# is 10003. Then specify the full path to the certificate and key files.#
-# An initialization file can be created for both the client and server  #
-# side.                                                                 #
-#-----------------------------------------------------------------------#
-BES.ServerSecure=no
-BES.ServerSecurePort=10003
-BES.ServerCertFile=/full/path/to/serverside/certificate/file.pem
-BES.ServerKeyFile=/full/path/to/serverside/key/file.pem
-BES.ClientCertFile=/full/path/to/clientside/certificate/file.pem
-BES.ClientKeyFile=/full/path/to/clientside/key/file.pem
-
 #-----------------------------------------------------------------------#
 # help file locations, for text, html, and xml versions                 #
 #-----------------------------------------------------------------------#
diff --git a/modules/hdf5_handler/bes-testsuite/bes.ignore.conf.modules.in b/modules/hdf5_handler/bes-testsuite/bes.ignore.conf.modules.in
index 6fa977c532..62e7afbf3a 100644
--- a/modules/hdf5_handler/bes-testsuite/bes.ignore.conf.modules.in
+++ b/modules/hdf5_handler/bes-testsuite/bes.ignore.conf.modules.in
@@ -146,21 +146,6 @@ BES.Catalog.catalog.FollowSymLinks=Yes
 BES.ServerPort=10002
 # BES.ServerUnixSocket=/tmp/bes.socket
 
-#-----------------------------------------------------------------------#
-# Security information for this server. ServerSecure specifies whether  #
-# the server is secure or not and requires authentication of the client #
-# using SSL certificates and keys. The default secure connection port   #
-# is 10003. Then specify the full path to the certificate and key files.#
-# An initialization file can be created for both the client and server  #
-# side.                                                                 #
-#-----------------------------------------------------------------------#
-BES.ServerSecure=no
-BES.ServerSecurePort=10003
-BES.ServerCertFile=/full/path/to/serverside/certificate/file.pem
-BES.ServerKeyFile=/full/path/to/serverside/key/file.pem
-BES.ClientCertFile=/full/path/to/clientside/certificate/file.pem
-BES.ClientKeyFile=/full/path/to/clientside/key/file.pem
-
 #-----------------------------------------------------------------------#
 # help file locations, for text, html, and xml versions                 #
 #-----------------------------------------------------------------------#
diff --git a/modules/netcdf_handler/tests/bes.conf.modules.in b/modules/netcdf_handler/tests/bes.conf.modules.in
index ed2a7aee23..9cfef6a1d8 100644
--- a/modules/netcdf_handler/tests/bes.conf.modules.in
+++ b/modules/netcdf_handler/tests/bes.conf.modules.in
@@ -28,13 +28,6 @@ BES.Catalog.catalog.FollowSymLinks=No
 BES.ServerPort=10002
 # BES.ServerUnixSocket=/tmp/bes.socket
 
-BES.ServerSecure=no
-BES.ServerSecurePort=10003
-BES.ServerCertFile=/full/path/to/serverside/certificate/file.pem
-BES.ServerKeyFile=/full/path/to/serverside/key/file.pem
-BES.ClientCertFile=/full/path/to/clientside/certificate/file.pem
-BES.ClientKeyFile=/full/path/to/clientside/key/file.pem
-
 #-----------------------------------------------------------------------#
 # help file locations, for text, html, and xml versions                 #
 #-----------------------------------------------------------------------#
diff --git a/modules/netcdf_handler/tests/bes_byte2short.conf.modules.in b/modules/netcdf_handler/tests/bes_byte2short.conf.modules.in
index 4ece57beb0..066e6074b6 100644
--- a/modules/netcdf_handler/tests/bes_byte2short.conf.modules.in
+++ b/modules/netcdf_handler/tests/bes_byte2short.conf.modules.in
@@ -28,13 +28,6 @@ BES.Catalog.catalog.FollowSymLinks=No
 BES.ServerPort=10002
 # BES.ServerUnixSocket=/tmp/bes.socket
 
-BES.ServerSecure=no
-BES.ServerSecurePort=10003
-BES.ServerCertFile=/full/path/to/serverside/certificate/file.pem
-BES.ServerKeyFile=/full/path/to/serverside/key/file.pem
-BES.ClientCertFile=/full/path/to/clientside/certificate/file.pem
-BES.ClientKeyFile=/full/path/to/clientside/key/file.pem
-
 #-----------------------------------------------------------------------#
 # help file locations, for text, html, and xml versions                 #
 #-----------------------------------------------------------------------#
diff --git a/modules/netcdf_handler/tests/bes_mds.conf.modules.in b/modules/netcdf_handler/tests/bes_mds.conf.modules.in
index 4e9bcf2780..c25ae29895 100644
--- a/modules/netcdf_handler/tests/bes_mds.conf.modules.in
+++ b/modules/netcdf_handler/tests/bes_mds.conf.modules.in
@@ -26,13 +26,6 @@ BES.Catalog.catalog.FollowSymLinks=No
 BES.ServerPort=10002
 # BES.ServerUnixSocket=/tmp/bes.socket
 
-BES.ServerSecure=no
-BES.ServerSecurePort=10003
-BES.ServerCertFile=/full/path/to/serverside/certificate/file.pem
-BES.ServerKeyFile=/full/path/to/serverside/key/file.pem
-BES.ClientCertFile=/full/path/to/clientside/certificate/file.pem
-BES.ClientKeyFile=/full/path/to/clientside/key/file.pem
-
 #-----------------------------------------------------------------------#
 # help file locations, for text, html, and xml versions                 #
 #-----------------------------------------------------------------------#
diff --git a/modules/netcdf_handler/ugrid_project/bes.conf.in b/modules/netcdf_handler/ugrid_project/bes.conf.in
index c15834018a..bfe0b2617b 100644
--- a/modules/netcdf_handler/ugrid_project/bes.conf.in
+++ b/modules/netcdf_handler/ugrid_project/bes.conf.in
@@ -144,23 +144,6 @@ BES.ServerPort=10022
 
 # BES.DaemonPort=11002
 
-#-----------------------------------------------------------------------#
-# Security information for this server. ServerSecure specifies whether  #
-# the server is secure or not and requires authentication of the client #
-# using SSL certificates and keys. The default secure connection port   #
-# is 10003. Then specify the full path to the certificate and key files.#
-# An initialization file can be created for both the client and server  #
-# side.                                                                 #
-#-----------------------------------------------------------------------#
-BES.ServerSecure=no
-BES.ServerSecurePort=10003
-BES.ServerCertFile=/full/path/to/serverside/certificate/file.pem
-BES.ServerCertAuthFile=/full/path/to/serverside/certificate/authority/file.pem
-BES.ServerKeyFile=/full/path/to/serverside/key/file.pem
-BES.ClientCertFile=/full/path/to/clientside/certificate/file.pem
-BES.ClientCertAuthFile=/full/path/to/clientside/certificate/authority/file.pem
-BES.ClientKeyFile=/full/path/to/clientside/key/file.pem
-
 #-----------------------------------------------------------------------#
 # help file locations, for text, html, and xml versions                 #
 #-----------------------------------------------------------------------#
diff --git a/modules/ugrid_functions/tests/bes.conf.modules.in b/modules/ugrid_functions/tests/bes.conf.modules.in
index 07ca9e34f9..e3a698e8e6 100644
--- a/modules/ugrid_functions/tests/bes.conf.modules.in
+++ b/modules/ugrid_functions/tests/bes.conf.modules.in
@@ -24,12 +24,6 @@ BES.FollowSymLinks=No
 BES.Catalog.catalog.FollowSymLinks=No
 
 BES.ServerPort=10002
-BES.ServerSecure=no
-BES.ServerSecurePort=10003
-BES.ServerCertFile=/full/path/to/serverside/certificate/file.pem
-BES.ServerKeyFile=/full/path/to/serverside/key/file.pem
-BES.ClientCertFile=/full/path/to/clientside/certificate/file.pem
-BES.ClientKeyFile=/full/path/to/clientside/key/file.pem
 
 BES.Help.TXT=@pkgdatadir@/bes_help.txt
 BES.Help.HTML=@pkgdatadir@/bes_help.html
diff --git a/modules/xml_data_handler/tests/bes.conf.modules.in b/modules/xml_data_handler/tests/bes.conf.modules.in
index a193f46ceb..919bbb9a5d 100644
--- a/modules/xml_data_handler/tests/bes.conf.modules.in
+++ b/modules/xml_data_handler/tests/bes.conf.modules.in
@@ -32,13 +32,6 @@ BES.Catalog.catalog.FollowSymLinks=No
 
 BES.ServerPort=10002
 
-BES.ServerSecure=no
-BES.ServerSecurePort=10003
-BES.ServerCertFile=/full/path/to/serverside/certificate/file.pem
-BES.ServerKeyFile=/full/path/to/serverside/key/file.pem
-BES.ClientCertFile=/full/path/to/clientside/certificate/file.pem
-BES.ClientKeyFile=/full/path/to/clientside/key/file.pem
-
 BES.Help.TXT=@pkgdatadir@/bes_help.txt
 BES.Help.HTML=@pkgdatadir@/bes_help.html
 BES.Help.XML=@pkgdatadir@/bes_help.txt
diff --git a/xmlcommand/tests/bes.conf.in b/xmlcommand/tests/bes.conf.in
index 5d2e7501b2..b24eccc7ac 100644
--- a/xmlcommand/tests/bes.conf.in
+++ b/xmlcommand/tests/bes.conf.in
@@ -41,13 +41,6 @@ BES.Data.RootDirectory=/dev/null
 BES.ServerPort=10002
 # BES.ServerUnixSocket=/tmp/bes.socket
 
-BES.ServerSecure=no
-BES.ServerSecurePort=10003
-BES.ServerCertFile=/full/path/to/serverside/certificate/file.pem
-BES.ServerKeyFile=/full/path/to/serverside/key/file.pem
-BES.ClientCertFile=/full/path/to/clientside/certificate/file.pem
-BES.ClientKeyFile=/full/path/to/clientside/key/file.pem
-
 BES.Help.TXT=@pkgdatadir@/bes_help.txt
 BES.Help.HTML=@pkgdatadir@/bes_help.html
 BES.Help.XML=@pkgdatadir@/bes_help.txt