diff --git a/common/src/main/java/bisq/common/app/Version.java b/common/src/main/java/bisq/common/app/Version.java
index fd8cfb6463..45fc057242 100644
--- a/common/src/main/java/bisq/common/app/Version.java
+++ b/common/src/main/java/bisq/common/app/Version.java
@@ -128,7 +128,6 @@ public class Version {
                 '}');
     }
 
-    //TODO move to consensus area
     public static final byte COMPENSATION_REQUEST = (byte) 0x01;
     public static final byte REIMBURSEMENT_REQUEST = (byte) 0x01;
     public static final byte PROPOSAL = (byte) 0x01;
diff --git a/common/src/main/java/bisq/common/consensus/UsedForTradeContractJson.java b/common/src/main/java/bisq/common/consensus/UsedForTradeContractJson.java
index 6aa722a4d7..94105d34f3 100644
--- a/common/src/main/java/bisq/common/consensus/UsedForTradeContractJson.java
+++ b/common/src/main/java/bisq/common/consensus/UsedForTradeContractJson.java
@@ -24,8 +24,5 @@ package bisq.common.consensus;
  * Better to use the excludeFromJsonDataMap (annotated with @JsonExclude; used in PaymentAccountPayload) to
  * add a key/value pair.
  */
-// TODO PubKeyRing and NodeAddress (network) are using UsedForTradeContractJson that is why it is in common module,
-// which is a bit weird... Maybe we need either rename common or split it to util and common where common is common code
-// used in network and core?
 public interface UsedForTradeContractJson {
 }
diff --git a/common/src/main/java/bisq/common/crypto/Encryption.java b/common/src/main/java/bisq/common/crypto/Encryption.java
index f4e1f8e022..8be207fe4c 100644
--- a/common/src/main/java/bisq/common/crypto/Encryption.java
+++ b/common/src/main/java/bisq/common/crypto/Encryption.java
@@ -48,7 +48,6 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-// TODO is Hmac needed/make sense?
 public class Encryption {
     private static final Logger log = LoggerFactory.getLogger(Encryption.class);
 
diff --git a/common/src/main/java/bisq/common/crypto/KeyStorage.java b/common/src/main/java/bisq/common/crypto/KeyStorage.java
index c132ab0042..7b4ecece08 100644
--- a/common/src/main/java/bisq/common/crypto/KeyStorage.java
+++ b/common/src/main/java/bisq/common/crypto/KeyStorage.java
@@ -55,7 +55,6 @@ import org.jetbrains.annotations.NotNull;
 
 import static bisq.common.util.Preconditions.checkDir;
 
-// TODO: use a password protection for key storage
 @Singleton
 public class KeyStorage {
     private static final Logger log = LoggerFactory.getLogger(KeyStorage.class);
diff --git a/common/src/main/java/bisq/common/proto/network/NetworkEnvelope.java b/common/src/main/java/bisq/common/proto/network/NetworkEnvelope.java
index 535d65d048..330fbd7216 100644
--- a/common/src/main/java/bisq/common/proto/network/NetworkEnvelope.java
+++ b/common/src/main/java/bisq/common/proto/network/NetworkEnvelope.java
@@ -48,7 +48,6 @@ public abstract class NetworkEnvelope implements Envelope {
         return getNetworkEnvelopeBuilder().build();
     }
 
-    // todo remove
     public protobuf.NetworkEnvelope toProtoNetworkEnvelope() {
         return getNetworkEnvelopeBuilder().build();
     }
diff --git a/core/src/main/java/bisq/core/provider/fee/FeeService.java b/core/src/main/java/bisq/core/provider/fee/FeeService.java
index 76427f5b3a..b43c4491b6 100644
--- a/core/src/main/java/bisq/core/provider/fee/FeeService.java
+++ b/core/src/main/java/bisq/core/provider/fee/FeeService.java
@@ -52,7 +52,6 @@ import javax.annotation.Nullable;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-// TODO use dao parameters for fee
 @Slf4j
 public class FeeService {
 
diff --git a/core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationManager.java b/core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationManager.java
index 8552003199..29f6b6939a 100644
--- a/core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationManager.java
+++ b/core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationManager.java
@@ -157,7 +157,7 @@ public final class ArbitrationManager extends DisputeManager<ArbitrationDisputeL
     @Override
     protected String getDisputeInfo(Dispute dispute) {
         String role = Res.get("shared.arbitrator").toLowerCase();
-        String link = "https://docs.bisq.network/trading-rules.html#legacy-arbitration"; //TODO needs to be created
+        String link = "https://docs.bisq.network/trading-rules.html#legacy-arbitration";
         return Res.get("support.initialInfo", role, role, link);
     }
 
diff --git a/desktop/src/main/java/bisq/desktop/components/AddressTextField.java b/desktop/src/main/java/bisq/desktop/components/AddressTextField.java
index 9bc06ce514..f9ca98a113 100644
--- a/desktop/src/main/java/bisq/desktop/components/AddressTextField.java
+++ b/desktop/src/main/java/bisq/desktop/components/AddressTextField.java
@@ -78,9 +78,6 @@ public class AddressTextField extends AnchorPane {
         });
 
         textField.focusTraversableProperty().set(focusTraversableProperty().get());
-        //TODO app wide focus
-        //focusedProperty().addListener((ov, oldValue, newValue) -> textField.requestFocus());
-
         Label extWalletIcon = new Label();
         extWalletIcon.setLayoutY(3);
         extWalletIcon.getStyleClass().addAll("icon", "highlight");
diff --git a/desktop/src/main/java/bisq/desktop/components/BsqAddressTextField.java b/desktop/src/main/java/bisq/desktop/components/BsqAddressTextField.java
index 97d61fd07b..a74a4ae2e3 100644
--- a/desktop/src/main/java/bisq/desktop/components/BsqAddressTextField.java
+++ b/desktop/src/main/java/bisq/desktop/components/BsqAddressTextField.java
@@ -74,9 +74,6 @@ public class BsqAddressTextField extends AnchorPane {
         });
 
         textField.focusTraversableProperty().set(focusTraversableProperty().get());
-        //TODO app wide focus
-        //focusedProperty().addListener((ov, oldValue, newValue) -> textField.requestFocus());
-
 
         Label copyIcon = new Label();
         copyIcon.setLayoutY(3);
diff --git a/desktop/src/main/java/bisq/desktop/components/TextFieldWithCopyIcon.java b/desktop/src/main/java/bisq/desktop/components/TextFieldWithCopyIcon.java
index fe26aebeab..7f2892379c 100644
--- a/desktop/src/main/java/bisq/desktop/components/TextFieldWithCopyIcon.java
+++ b/desktop/src/main/java/bisq/desktop/components/TextFieldWithCopyIcon.java
@@ -79,9 +79,6 @@ public class TextFieldWithCopyIcon extends AnchorPane {
         AnchorPane.setRightAnchor(textField, 30.0);
         AnchorPane.setLeftAnchor(textField, 0.0);
         textField.focusTraversableProperty().set(focusTraversableProperty().get());
-        //TODO app wide focus
-        //focusedProperty().addListener((ov, oldValue, newValue) -> textField.requestFocus());
-
         getChildren().addAll(textField, copyIcon);
     }
 
diff --git a/desktop/src/main/java/bisq/desktop/main/account/register/AgentRegistrationView.java b/desktop/src/main/java/bisq/desktop/main/account/register/AgentRegistrationView.java
index 4af167a594..656d126f86 100644
--- a/desktop/src/main/java/bisq/desktop/main/account/register/AgentRegistrationView.java
+++ b/desktop/src/main/java/bisq/desktop/main/account/register/AgentRegistrationView.java
@@ -64,8 +64,6 @@ import static bisq.desktop.util.FormBuilder.addMultilineLabel;
 import static bisq.desktop.util.FormBuilder.addTitledGroupBg;
 import static bisq.desktop.util.FormBuilder.addTopLabelTextField;
 
-// TODO translation string keys should renamed to be more generic.
-// Lets do it for 1.1.7 the translator have time to add new string.
 public abstract class AgentRegistrationView<R extends DisputeAgent, T extends AgentRegistrationViewModel<R, ?>>
         extends ActivatableViewAndModel<VBox, T> {
 
diff --git a/desktop/src/main/java/bisq/desktop/main/market/spread/SpreadView.java b/desktop/src/main/java/bisq/desktop/main/market/spread/SpreadView.java
index 02a2a402e5..539ab5ffad 100644
--- a/desktop/src/main/java/bisq/desktop/main/market/spread/SpreadView.java
+++ b/desktop/src/main/java/bisq/desktop/main/market/spread/SpreadView.java
@@ -298,7 +298,7 @@ public class SpreadView extends ActivatableViewAndModel<GridPane, SpreadViewMode
                             public void updateItem(final SpreadItem item, boolean empty) {
                                 super.updateItem(item, empty);
                                 if (item != null && !empty) {
-                                    // TODO maybe show exra colums with item.priceSpread and use real amount diff
+                                    // TODO maybe show extra columns with item.priceSpread and use real amount diff
                                     // not % based
                                     if (item.priceSpread != null)
                                         setText(item.percentage);
diff --git a/desktop/src/main/java/bisq/desktop/main/market/spread/SpreadViewModel.java b/desktop/src/main/java/bisq/desktop/main/market/spread/SpreadViewModel.java
index 97aecedb3c..e5ee933ca0 100644
--- a/desktop/src/main/java/bisq/desktop/main/market/spread/SpreadViewModel.java
+++ b/desktop/src/main/java/bisq/desktop/main/market/spread/SpreadViewModel.java
@@ -172,7 +172,7 @@ class SpreadViewModel extends ActivatableViewModel {
                     else
                         spread = bestBuyOfferPrice.subtract(bestSellOfferPrice);
 
-                    // TODO maybe show extra colums with spread and use real amount diff
+                    // TODO maybe show extra columns with spread and use real amount diff
                     // not % based. e.g. diff between best buy and sell offer (of small amounts its a smaller gain)
 
                     if (spread != null && marketPrice != null && marketPrice.isPriceAvailable()) {
diff --git a/desktop/src/main/java/bisq/desktop/util/FormBuilder.java b/desktop/src/main/java/bisq/desktop/util/FormBuilder.java
index 46db98c015..f8061e04f9 100644
--- a/desktop/src/main/java/bisq/desktop/util/FormBuilder.java
+++ b/desktop/src/main/java/bisq/desktop/util/FormBuilder.java
@@ -332,7 +332,7 @@ public class FormBuilder {
 
         final Tuple2<Label, VBox> topLabelWithVBox = addTopLabelWithVBox(gridPane, rowIndex, title, textField, top);
 
-        // TOD not 100% sure if that is a good idea....
+        // TODO not 100% sure if that is a good idea....
         //topLabelWithVBox.first.getStyleClass().add("jfx-text-field-top-label");
 
         return new Tuple3<>(topLabelWithVBox.first, textField, topLabelWithVBox.second);
diff --git a/monitor/src/main/java/bisq/monitor/metric/MarketStats.java b/monitor/src/main/java/bisq/monitor/metric/MarketStats.java
index 389722329a..f831cafd13 100644
--- a/monitor/src/main/java/bisq/monitor/metric/MarketStats.java
+++ b/monitor/src/main/java/bisq/monitor/metric/MarketStats.java
@@ -20,30 +20,15 @@ package bisq.monitor.metric;
 import bisq.monitor.Metric;
 import bisq.monitor.Reporter;
 
-import bisq.asset.Asset;
-import bisq.asset.AssetRegistry;
-
-import bisq.network.p2p.storage.payload.ProtectedStoragePayload;
-
-import org.berndpruenster.netlayer.tor.TorCtlException;
-
-import com.runjva.sourceforge.jsocks.protocol.SocksSocket;
-
-import java.net.HttpURLConnection;
-import java.net.Socket;
 import java.net.URL;
 import java.net.URLConnection;
 
 import java.io.BufferedReader;
-import java.io.BufferedWriter;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
 
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
@@ -110,7 +95,6 @@ public class MarketStats extends Metric {
         } catch (IllegalStateException ignore) {
             // no match found
         } catch (IOException e) {
-            // TODO Auto-generated catch block
             e.printStackTrace();
         }
     }
diff --git a/monitor/src/main/java/bisq/monitor/metric/PriceNodeStats.java b/monitor/src/main/java/bisq/monitor/metric/PriceNodeStats.java
index 9258eb5e8d..fd10691f72 100644
--- a/monitor/src/main/java/bisq/monitor/metric/PriceNodeStats.java
+++ b/monitor/src/main/java/bisq/monitor/metric/PriceNodeStats.java
@@ -54,7 +54,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 /**
  * Fetches fee and price data from the configured price nodes.
  * Based on the work of HarryMcFinned.
- * 
+ *
  * @author Florian Reimair
  * @author HarryMcFinned
  *
@@ -159,7 +159,6 @@ public class PriceNodeStats extends Metric {
                 }
             }
         } catch (TorCtlException | IOException e) {
-            // TODO Auto-generated catch block
             e.printStackTrace();
         }
     }
diff --git a/monitor/src/main/java/bisq/monitor/metric/TorRoundTripTime.java b/monitor/src/main/java/bisq/monitor/metric/TorRoundTripTime.java
index 16499689b0..a40c026166 100644
--- a/monitor/src/main/java/bisq/monitor/metric/TorRoundTripTime.java
+++ b/monitor/src/main/java/bisq/monitor/metric/TorRoundTripTime.java
@@ -21,6 +21,7 @@ import bisq.monitor.Metric;
 import bisq.monitor.OnionParser;
 import bisq.monitor.Reporter;
 import bisq.monitor.StatisticsHelper;
+
 import bisq.network.p2p.NodeAddress;
 
 import org.berndpruenster.netlayer.tor.Tor;
@@ -33,6 +34,7 @@ import java.io.IOException;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
@@ -84,7 +86,6 @@ public class TorRoundTripTime extends Metric {
                 reporter.report(StatisticsHelper.process(samples), getName());
             }
         } catch (TorCtlException | IOException e) {
-            // TODO Auto-generated catch block
             e.printStackTrace();
         }
     }
diff --git a/monitor/src/main/java/bisq/monitor/metric/TorStartupTime.java b/monitor/src/main/java/bisq/monitor/metric/TorStartupTime.java
index 6e53e02462..9ea3198e19 100644
--- a/monitor/src/main/java/bisq/monitor/metric/TorStartupTime.java
+++ b/monitor/src/main/java/bisq/monitor/metric/TorStartupTime.java
@@ -58,7 +58,6 @@ public class TorStartupTime extends Metric {
             try {
                 torOverrides = new Torrc(overrides);
             } catch (IOException e) {
-                // TODO Auto-generated catch block
                 e.printStackTrace();
             }
         }
@@ -79,7 +78,6 @@ public class TorStartupTime extends Metric {
             // stop the timer and set its timestamp
             reporter.report(System.currentTimeMillis() - start, getName());
         } catch (TorCtlException e) {
-            // TODO Auto-generated catch block
             e.printStackTrace();
         } finally {
             // cleanup