diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84bcc6d77..a0170ea5e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -159,9 +159,6 @@ option (UPDATE_TRANSLATIONS "Update source translation translations/*.ts
 files (WARNING: make clean will delete the source .ts files! Danger!)")
 option (WSJT_SHARED_RUNTIME "Debugging option that allows running from a shared Cloud directory.")
 option (WSJT_QDEBUG_TO_FILE "Redirect Qt debuging messages to a trace file.")
-option (WSJT_TRACE_CAT "Debugging option that turns on CAT diagnostics.")
-option (WSJT_TRACE_CAT_POLLS "Debugging option that turns on CAT diagnostics during polling.")
-option (WSJT_HAMLIB_TRACE "Debugging option that turns on minimal Hamlib internal diagnostics.")
 option (WSJT_SOFT_KEYING "Apply a ramp to CW keying envelope to reduce transients." ON)
 option (WSJT_SKIP_MANPAGES "Skip *nix manpage generation.")
 option (WSJT_GENERATE_DOCS "Generate documentation files." ON)
@@ -169,9 +166,6 @@ option (WSJT_RIG_NONE_CAN_SPLIT "Allow split operation with \"None\" as rig.")
 option (WSJT_TRACE_UDP "Debugging option that turns on UDP message protocol diagnostics.")
 option (WSJT_BUILD_UTILS "Build simulators and code demonstrators." ON)
 
-CMAKE_DEPENDENT_OPTION (WSJT_HAMLIB_VERBOSE_TRACE "Debugging option that turns on full Hamlib internal diagnostics." OFF WSJT_HAMLIB_TRACE OFF)
-CMAKE_DEPENDENT_OPTION (WSJT_QDEBUG_IN_RELEASE "Leave Qt debugging statements in Release configuration." OFF
-  "NOT is_debug_build" OFF)
 CMAKE_DEPENDENT_OPTION (WSJT_ENABLE_EXPERIMENTAL_FEATURES "Enable features not fully ready for public releases." ON
   is_debug_build OFF)
 CMAKE_DEPENDENT_OPTION (WSJT_CREATE_WINMAIN
@@ -816,17 +810,10 @@ set_source_files_properties (${WSJTX_ICON_FILE} PROPERTIES MACOSX_PACKAGE_LOCATI
 set_source_files_properties (lib/decoder.f90 PROPERTIES COMPILE_FLAGS "-Wno-unused-dummy-argument")
 set_source_files_properties (lib/filbig.f90 PROPERTIES COMPILE_FLAGS "-Wno-aliasing")
 
-if (WSJT_QDEBUG_IN_RELEASE)
-  # context info in Qt message handler in release configuration
-  set_property (DIRECTORY APPEND PROPERTY
-    COMPILE_DEFINITIONS $<$<NOT:$<CONFIG:Debug>>:QT_MESSAGELOGCONTEXT>
-    )
-else (WSJT_QDEBUG_IN_RELEASE)
-  # disable Qt trace and warning messages from release configurations
-  set_property (DIRECTORY APPEND PROPERTY
-    COMPILE_DEFINITIONS $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG_OUTPUT;QT_NO_WARNING_OUTPUT>
-    )
-endif (WSJT_QDEBUG_IN_RELEASE)
+## disable Qt trace and warning messages from release configurations
+#set_property (DIRECTORY APPEND PROPERTY
+#  COMPILE_DEFINITIONS $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG_OUTPUT;QT_NO_WARNING_OUTPUT>
+#  )
 
 set_property (SOURCE ${all_C_and_CXXSRCS} APPEND_STRING PROPERTY COMPILE_FLAGS " -include wsjtx_config.h")
 set_property (SOURCE ${all_C_and_CXXSRCS} APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/wsjtx_config.h)
diff --git a/wsjtx_config.h.in b/wsjtx_config.h.in
index 0866cf061..fa41c3e03 100644
--- a/wsjtx_config.h.in
+++ b/wsjtx_config.h.in
@@ -22,12 +22,6 @@ extern "C"  {
 #cmakedefine01 HAVE_HAMLIB_CACHING
 
 #cmakedefine01 WSJT_SHARED_RUNTIME
-#cmakedefine01 WSJT_QDEBUG_TO_FILE
-#cmakedefine01 WSJT_QDEBUG_IN_RELEASE
-#cmakedefine01 WSJT_TRACE_CAT
-#cmakedefine01 WSJT_TRACE_CAT_POLLS
-#cmakedefine01 WSJT_HAMLIB_TRACE
-#cmakedefine01 WSJT_HAMLIB_VERBOSE_TRACE
 #cmakedefine01 WSJT_SOFT_KEYING
 #cmakedefine01 WSJT_ENABLE_EXPERIMENTAL_FEATURES
 #cmakedefine01 WSJT_RIG_NONE_CAN_SPLIT