diff --git a/projects/mtg/src/GameStateDeckViewer.cpp b/projects/mtg/src/GameStateDeckViewer.cpp
index 6323fc171..3dfa3e24f 100644
--- a/projects/mtg/src/GameStateDeckViewer.cpp
+++ b/projects/mtg/src/GameStateDeckViewer.cpp
@@ -222,11 +222,6 @@ void GameStateDeckViewer::Update(float dt)
         }
         mStage = STAGE_WAITING;
       }
-      //They cancelled, so dump them back to where they were.
-      else {
-        updateDecks();
-        mStage = STAGE_WELCOME;
-      }
       newDeckname = "";
     }
     //Prevent screen from updating.
@@ -739,18 +734,6 @@ void GameStateDeckViewer::ButtonPressed(int controllerId, int controlId)
           mParent->SetNextState(GAME_STATE_MENU);
           break;
         }
-        else if(controlId == nbDecks+1){
-          char buf[512];
-          deckNum = controlId;
-          sprintf(buf,"deck%i",deckNum);
-          options.keypadStart(buf,&newDeckname);
-          options.keypadTitle("Deck name"); 
-          loadDeck(controlId);
-          deckNum = controlId; 
-          //Doesn't fallthrough to deck editing.
-          //Only change states when keypad finished.
-          break;
-        }
         loadDeck(controlId);
         mStage = STAGE_WAITING;
         deckNum = controlId;