diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java
index 82a3c2e8e..0ff88d97c 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java
@@ -76,10 +76,6 @@ public class SelectSecretKeyActivity extends ActionBarActivity {
         Intent data = new Intent();
         data.setData(selectedUri);
 
-        // TODO: deprecate RESULT_EXTRA_MASTER_KEY_ID!
-        long masterKeyId = Long.valueOf(selectedUri.getLastPathSegment());
-        data.putExtra(RESULT_EXTRA_MASTER_KEY_ID, masterKeyId);
-
         setResult(RESULT_OK, data);
         finish();
     }
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java
index 5b441f17b..41e250bb7 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java
@@ -63,7 +63,6 @@ public class SelectSecretKeyLayoutFragment extends Fragment implements LoaderMan
 
     public interface SelectSecretKeyCallback {
         void onKeySelected(long secretKeyId);
-
     }
 
     public void setCallback(SelectSecretKeyCallback callback) {