diff --git a/src/DeterministicKeys.cpp b/src/DeterministicKeys.cpp
index dc050067f1..08a14bb430 100644
--- a/src/DeterministicKeys.cpp
+++ b/src/DeterministicKeys.cpp
@@ -5,6 +5,8 @@
 #include <openssl/pem.h>
 #include <openssl/err.h>
 
+// #define EC_DEBUG
+
 // Functions to add CKey support for deterministic EC keys
 
 #include "Serializer.h"
@@ -107,7 +109,9 @@ EC_KEY* CKey::GenerateRootDeterministicKey(const uint128& seed)
 
 	BN_CTX_free(ctx);
 
-	assert(EC_KEY_check_key(pkey)==1);
+#ifdef EC_DEBUG
+	assert(EC_KEY_check_key(pkey)==1); // CAUTION: This check is *very* expensive
+#endif
 	return pkey;
 }
 
diff --git a/src/LedgerEntrySet.cpp b/src/LedgerEntrySet.cpp
index 478290bb33..a3d4ef2ba5 100644
--- a/src/LedgerEntrySet.cpp
+++ b/src/LedgerEntrySet.cpp
@@ -5,6 +5,8 @@
 
 #include "Log.h"
 
+// #define META_DEBUG
+
 // Small for testing, should likely be 32 or 64.
 #define DIR_NODE_MAX		2
 
@@ -294,7 +296,9 @@ SLE::pointer LedgerEntrySet::getForMod(const uint256& node, Ledger::ref ledger,
 bool LedgerEntrySet::threadTx(const NewcoinAddress& threadTo, Ledger::ref ledger,
 	boost::unordered_map<uint256, SLE::pointer>& newMods)
 {
+#ifdef META_DEBUG
 	Log(lsTRACE) << "Thread to " << threadTo.getAccountID();
+#endif
 	SLE::pointer sle = getForMod(Ledger::getAccountRootIndex(threadTo.getAccountID()), ledger, newMods);
 	if (!sle)
 	{
@@ -321,12 +325,16 @@ bool LedgerEntrySet::threadOwners(SLE::ref node, Ledger::ref ledger, boost::unor
 { // thread new or modified node to owner or owners
 	if (node->hasOneOwner()) // thread to owner's account
 	{
+#ifdef META_DEBUG
 		Log(lsTRACE) << "Thread to single owner";
+#endif
 		return threadTx(node->getOwner(), ledger, newMods);
 	}
 	else if (node->hasTwoOwners()) // thread to owner's accounts]
 	{
+#ifdef META_DEBUG
 		Log(lsTRACE) << "Thread to two owners";
+#endif
 		return
 			threadTx(node->getFirstOwner(), ledger, newMods) &&
 			threadTx(node->getSecondOwner(), ledger, newMods);
@@ -349,17 +357,23 @@ void LedgerEntrySet::calcRawMeta(Serializer& s)
 		switch (it->second.mAction)
 		{
 			case taaMODIFY:
+#ifdef META_DEBUG
 				Log(lsTRACE) << "Modified Node " << it->first;
+#endif
 				nType = TMNModifiedNode;
 				break;
 
 			case taaDELETE:
+#ifdef META_DEBUG
 				Log(lsTRACE) << "Deleted Node " << it->first;
+#endif
 				nType = TMNDeletedNode;
 				break;
 
 			case taaCREATE:
+#ifdef META_DEBUG
 				Log(lsTRACE) << "Created Node " << it->first;
+#endif
 				nType = TMNCreatedNode;
 				break;
 
@@ -420,10 +434,7 @@ void LedgerEntrySet::calcRawMeta(Serializer& s)
 		if ((nType == TMNCreatedNode) || (nType == TMNModifiedNode))
 		{
 			if (curNode->isThreadedType()) // always thread to self
-			{
-				Log(lsTRACE) << "Thread to self";
 				threadTx(curNode, mLedger, newMod);
-			}
 		}
 
 		if (nType == TMNModifiedNode)
@@ -454,7 +465,7 @@ void LedgerEntrySet::calcRawMeta(Serializer& s)
 			it != end; ++it)
 		entryModify(it->second);
 
-#ifdef DEBUG
+#ifdef META_DEBUG
 	Log(lsINFO) << "Metadata:" << mSet.getJson(0);
 #endif