diff --git a/aqt/addcards.py b/aqt/addcards.py
index 0499ca23c..831c91cdf 100644
--- a/aqt/addcards.py
+++ b/aqt/addcards.py
@@ -135,7 +135,7 @@ class AddCards(QDialog):
         cards = self.mw.col.addNote(note)
         if not cards:
             showWarning(_("""\
-The input you have provided would make an empty
+The input you have provided would make an empty \
 question or answer on all cards."""), help="AddItems")
             return
         self.addHistory(note)
diff --git a/aqt/clayout.py b/aqt/clayout.py
index 332cdfb06..0bc72361e 100644
--- a/aqt/clayout.py
+++ b/aqt/clayout.py
@@ -257,7 +257,7 @@ Enter deck to place new %s cards in, or leave blank:""") %
         self.reject()
 
     def reject(self):
-        self.mm.save(self.model)
+        self.mm.save(self.model, templates=True)
         self.mw.reset()
         saveGeom(self, "CardLayout")
         return QDialog.reject(self)
diff --git a/aqt/main.py b/aqt/main.py
index 04f4785d6..9a19da65c 100755
--- a/aqt/main.py
+++ b/aqt/main.py
@@ -69,9 +69,9 @@ class AnkiQt(QMainWindow):
         self.setupSystemSpecific()
         self.setupSignals()
         self.setupAutoUpdate()
-        self.setupUpgrade()
         self.setupCardStats()
         self.setupSchema()
+        self.setupEmptyCardDel()
         self.updateTitleBar()
         # screens
         self.setupDeckBrowser()
@@ -445,17 +445,6 @@ title="%s">%s</button>''' % (
         from aqt.reviewer import Reviewer
         self.reviewer = Reviewer(self)
 
-    # Upgrading from previous versions
-    ##########################################################################
-
-    def setupUpgrade(self):
-        addHook("1.x upgrade", self.onUpgrade)
-
-    def onUpgrade(self, db):
-        self.upgrading = True
-        self.progress.setupDB(db)
-        self.progress.start(label=_("Upgrading. Please be patient..."))
-
     # Collection loading
     ##########################################################################
 
@@ -818,6 +807,16 @@ This operation can't be merged when syncing, so if you have made \
 changes on other devices that haven't been synced to this device yet, \
 they will be lost. Are you sure you want to continue?"""))
 
+    # Empty card deletion
+    ##########################################################################
+
+    def setupEmptyCardDel(self):
+        addHook("remEmptyCards", self.onEmptyCards)
+
+    def onEmptyCards(self, val, *args):
+        return askUser(_("""\
+Your edits have left some cards empty. Do you want to delete them?"""))
+
     # Advanced features
     ##########################################################################