From fc45196fd1f95faa68ddf31e068caac089f15729 Mon Sep 17 00:00:00 2001
From: Jonathan Harris <jonathan@marginal.org.uk>
Date: Fri, 3 Feb 2017 15:01:18 +0000
Subject: [PATCH] Remove pre-migration settings

---
 prefs.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/prefs.py b/prefs.py
index 62208469..e35495ed 100644
--- a/prefs.py
+++ b/prefs.py
@@ -686,11 +686,10 @@ def migrate(current_cmdr):
         config.set('fdev_usernames', [config.get('username')])
         config.set('edsm_usernames', [config.get('edsm_cmdrname') or ''])
         config.set('edsm_apikeys',   [config.get('edsm_apikey') or ''])
-        # XXX to be done for release
-        # config.delete('username')
-        # config.delete('password')
-        # config.delete('edsm_cmdrname')
-        # config.delete('edsm_apikey')
+        config.delete('username')
+        config.delete('password')
+        config.delete('edsm_cmdrname')
+        config.delete('edsm_apikey')
 
 # Put current Cmdr first in the lists
 def make_current(current_cmdr):