diff --git a/src/main/java/forge/control/FControl.java b/src/main/java/forge/control/FControl.java
index 4da39e4de10..d573ae4ba76 100644
--- a/src/main/java/forge/control/FControl.java
+++ b/src/main/java/forge/control/FControl.java
@@ -118,11 +118,10 @@ public final class FControl {
         clearChildren(JLayeredPane.DEFAULT_LAYER);
         this.state = i0;
 
-        /// out out out ghandi asdf
+        /// TODO should these be here?
         Singletons.getView().removeWindowListener(waConcede);
         Singletons.getView().removeWindowListener(waLeaveBazaar);
         Singletons.getView().addWindowListener(waDefault);
-        ////////////////
 
         // Fire up new state
         switch (i0) {
diff --git a/src/main/java/forge/gui/deckeditor/DeckEditorDraft.java b/src/main/java/forge/gui/deckeditor/DeckEditorDraft.java
index 54cb69a3529..24ccc157d1b 100644
--- a/src/main/java/forge/gui/deckeditor/DeckEditorDraft.java
+++ b/src/main/java/forge/gui/deckeditor/DeckEditorDraft.java
@@ -132,7 +132,6 @@ public class DeckEditorDraft extends DeckEditorBase {
                         ForgeProps.getLocalized(GuiBoosterDraft.CLOSE_MESSAGE), "", JOptionPane.YES_NO_OPTION);
                 if (n == JOptionPane.YES_OPTION) {
                     DeckEditorDraft.this.dispose();
-// ghandi why is draft controller in a view
                     Singletons.getView().getHomeView().getDraftController().updateHumanDecks();
                 }
             } // windowClosing()
@@ -350,7 +349,6 @@ public class DeckEditorDraft extends DeckEditorBase {
         // close and open next screen
         this.dispose();
 
-// ghandi here is is again
         Singletons.getView().getHomeView().getDraftController().updateHumanDecks();
 
     } /* saveDraft() */
diff --git a/src/main/java/forge/view/match/ViewTabber.java b/src/main/java/forge/view/match/ViewTabber.java
index 1bdce7f51f8..ebb2ed88274 100644
--- a/src/main/java/forge/view/match/ViewTabber.java
+++ b/src/main/java/forge/view/match/ViewTabber.java
@@ -274,7 +274,6 @@ public class ViewTabber extends JPanel {
                 @Override
                 public void mouseEntered(final MouseEvent e) {
                     Singletons.getControl().getMatchControl().setCard(spell.getSpellAbility().getSourceCard());
-                    // ghandi does this work?
                 }
             });