diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7487351ec..010d70515 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,8 +31,6 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
 endif()
 
 option(BUILD_CENTRAL_CONTROLLER "Build ZeroTier Central Controller" OFF)
-option(ZT_TRACE "Trace Messages" OFF)
-option(ZT_DEBUG_TRACE "Debug Trace Messages" OFF)
 
 if (BUILD_CENTRAL_CONTROLLER)
 	find_package(PostgreSQL REQUIRED)
diff --git a/node/Trace.hpp b/node/Trace.hpp
index efdff48b2..763d64537 100644
--- a/node/Trace.hpp
+++ b/node/Trace.hpp
@@ -57,15 +57,8 @@ public:
 	public:
 		ZT_ALWAYS_INLINE RuleResultLog() { this->clear(); }
 
-		ZT_ALWAYS_INLINE void log(const unsigned int rn,const uint8_t thisRuleMatches,const uint8_t thisSetMatches)
-		{
-			_l[rn >> 1U] |= ( ((thisRuleMatches + 1U) << 2U) | (thisSetMatches + 1U) ) << ((rn & 1U) << 2U);
-		}
-		ZT_ALWAYS_INLINE void logSkipped(const unsigned int rn,const uint8_t thisSetMatches)
-		{
-			_l[rn >> 1U] |= (thisSetMatches + 1U) << ((rn & 1U) << 2U);
-		}
-
+		ZT_ALWAYS_INLINE void log(const unsigned int rn,const uint8_t thisRuleMatches,const uint8_t thisSetMatches) { _l[rn >> 1U] |= ( ((thisRuleMatches + 1U) << 2U) | (thisSetMatches + 1U) ) << ((rn & 1U) << 2U); }
+		ZT_ALWAYS_INLINE void logSkipped(const unsigned int rn,const uint8_t thisSetMatches) { _l[rn >> 1U] |= (thisSetMatches + 1U) << ((rn & 1U) << 2U); }
 		ZT_ALWAYS_INLINE void clear() { memset(_l,0,sizeof(_l)); }
 
 		ZT_ALWAYS_INLINE const uint8_t *data() const { return _l; }