diff --git a/log4j2.properties b/log4j2.properties
index 063eec24..ce13b641 100644
--- a/log4j2.properties
+++ b/log4j2.properties
@@ -12,7 +12,7 @@ logger.hsqldb.level = warn
 
 # Support optional, per-session HSQLDB debugging
 logger.hsqldbRepository.name = org.qora.repository.hsqldb
-logger.hsqldbRepository.level = trace
+logger.hsqldbRepository.level = debug
 
 # Suppress extraneous Jersey warning
 logger.jerseyInject.name = org.glassfish.jersey.internal.inject.Providers
diff --git a/src/main/java/org/qora/data/asset/OrderData.java b/src/main/java/org/qora/data/asset/OrderData.java
index 4833f288..32067290 100644
--- a/src/main/java/org/qora/data/asset/OrderData.java
+++ b/src/main/java/org/qora/data/asset/OrderData.java
@@ -77,8 +77,7 @@ public class OrderData implements Comparable<OrderData> {
 		if (this.haveAssetName == null)
 			return;
 
-		// 'old' pricing scheme is simpler so test for that first
-		// XXX TODO
+		// TODO: fill in for 'old' pricing scheme
 
 		// 'new' pricing scheme
 		if (this.haveAssetId < this.wantAssetId) {
diff --git a/src/main/java/org/qora/repository/hsqldb/HSQLDBATRepository.java b/src/main/java/org/qora/repository/hsqldb/HSQLDBATRepository.java
index bf04748f..9fab4c69 100644
--- a/src/main/java/org/qora/repository/hsqldb/HSQLDBATRepository.java
+++ b/src/main/java/org/qora/repository/hsqldb/HSQLDBATRepository.java
@@ -35,7 +35,7 @@ public class HSQLDBATRepository implements ATRepository {
 			long creation = resultSet.getTimestamp(2, Calendar.getInstance(HSQLDBRepository.UTC)).getTime();
 			int version = resultSet.getInt(3);
 			long assetId = resultSet.getLong(4);
-			byte[] codeBytes = resultSet.getBytes(5); // XXX: Actually BLOB
+			byte[] codeBytes = resultSet.getBytes(5); // Actually BLOB
 			boolean isSleeping = resultSet.getBoolean(6);
 
 			Integer sleepUntilHeight = resultSet.getInt(7);
@@ -74,7 +74,7 @@ public class HSQLDBATRepository implements ATRepository {
 				long creation = resultSet.getTimestamp(3, Calendar.getInstance(HSQLDBRepository.UTC)).getTime();
 				int version = resultSet.getInt(4);
 				long assetId = resultSet.getLong(5);
-				byte[] codeBytes = resultSet.getBytes(6); // XXX: Actually BLOB
+				byte[] codeBytes = resultSet.getBytes(6); // Actually BLOB
 				boolean isSleeping = resultSet.getBoolean(7);
 
 				Integer sleepUntilHeight = resultSet.getInt(8);
diff --git a/src/main/java/org/qora/repository/hsqldb/HSQLDBAccountRepository.java b/src/main/java/org/qora/repository/hsqldb/HSQLDBAccountRepository.java
index 981df2dc..8c8ef013 100644
--- a/src/main/java/org/qora/repository/hsqldb/HSQLDBAccountRepository.java
+++ b/src/main/java/org/qora/repository/hsqldb/HSQLDBAccountRepository.java
@@ -124,14 +124,7 @@ public class HSQLDBAccountRepository implements AccountRepository {
 			if (publicKey != null)
 				saveHelper.bind("public_key", publicKey);
 
-			// XXX TMP DEBUGGING
-			boolean priorDebug = this.repository.getDebug();
-			this.repository.setDebug(true);
-
 			saveHelper.execute(this.repository);
-
-			// XXX TMP DEBUGGING
-			this.repository.setDebug(priorDebug);
 		} catch (SQLException e) {
 			throw new DataException("Unable to ensure minimal account in repository", e);
 		}
@@ -148,14 +141,7 @@ public class HSQLDBAccountRepository implements AccountRepository {
 			saveHelper.bind("public_key", publicKey);
 
 		try {
-			// XXX TMP DEBUGGING
-			boolean priorDebug = this.repository.getDebug();
-			this.repository.setDebug(true);
-
 			saveHelper.execute(this.repository);
-
-			// XXX TMP DEBUGGING
-			this.repository.setDebug(priorDebug);
 		} catch (SQLException e) {
 			throw new DataException("Unable to save account's last reference into repository", e);
 		}
@@ -172,14 +158,7 @@ public class HSQLDBAccountRepository implements AccountRepository {
 			saveHelper.bind("public_key", publicKey);
 
 		try {
-			// XXX TMP DEBUGGING
-			boolean priorDebug = this.repository.getDebug();
-			this.repository.setDebug(true);
-
 			saveHelper.execute(this.repository);
-
-			// XXX TMP DEBUGGING
-			this.repository.setDebug(priorDebug);
 		} catch (SQLException e) {
 			throw new DataException("Unable to save account's default group ID into repository", e);
 		}
@@ -196,14 +175,7 @@ public class HSQLDBAccountRepository implements AccountRepository {
 			saveHelper.bind("public_key", publicKey);
 
 		try {
-			// XXX TMP DEBUGGING
-			boolean priorDebug = this.repository.getDebug();
-			this.repository.setDebug(true);
-
 			saveHelper.execute(this.repository);
-
-			// XXX TMP DEBUGGING
-			this.repository.setDebug(priorDebug);
 		} catch (SQLException e) {
 			throw new DataException("Unable to save account's flags into repository", e);
 		}
@@ -220,14 +192,7 @@ public class HSQLDBAccountRepository implements AccountRepository {
 			saveHelper.bind("public_key", publicKey);
 
 		try {
-			// XXX TMP DEBUGGING
-			boolean priorDebug = this.repository.getDebug();
-			this.repository.setDebug(true);
-
 			saveHelper.execute(this.repository);
-
-			// XXX TMP DEBUGGING
-			this.repository.setDebug(priorDebug);
 		} catch (SQLException e) {
 			throw new DataException("Unable to save account's forging enabler into repository", e);
 		}