diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java
index de4db520f..b767f2465 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java
@@ -331,18 +331,12 @@ public class SecurityTokenOperationActivity extends BaseSecurityTokenActivity {
                 protected Void doInBackground(Void... params) {
                     // check all 200ms if Security Token has been taken away
                     while (true) {
-                        try {
-                            if (stConnection.isConnected()) {
+                        if (stConnection.isConnected()) {
+                            try {
                                 Thread.sleep(200);
-                            } else {
-                                return null;
+                            } catch (InterruptedException ignored) {
                             }
-                        } catch (InterruptedException ignored) {
-                            // Sleep interrupted; ignore
-                        } catch (SecurityException ignored) {
-                            // In newer version of Android, isConnected() can throw an SecurityException
-                            // when the Tag object becomes "stale"; this simply means the tag has been removed
-                            // (and possibly rediscovered), so we can safely break from here.
+                        } else {
                             return null;
                         }
                     }
diff --git a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/SplitUserIdTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/SplitUserIdTest.java
index 335be9825..8f8ca1337 100644
--- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/SplitUserIdTest.java
+++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/SplitUserIdTest.java
@@ -130,12 +130,4 @@ public class SplitUserIdTest {
         Assert.assertEquals("this is a comment", info.comment);
     }
 
-    @Test
-    public void splitUserIdWithEmailWithoutTldShouldReturnNameAndEmail() {
-        OpenPgpUtils.UserId info = KeyRing.splitUserId("Max Mustermann <max@localhost>");
-        Assert.assertEquals("Max Mustermann", info.name);
-        Assert.assertEquals("max@localhost", info.email);
-        Assert.assertNull(info.comment);
-    }
-
-}
+}
\ No newline at end of file
diff --git a/README.md b/README.md
index 9f7809e3e..86fac8808 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,3 @@
-**WARNING: This software is no longer actively developed.**
-We will still apply security fixes where reported, and do basic maintenance work, but no new features or will be worked on.
-We will try to consider and merge contributions where possible.
-
 # OpenKeychain (for Android)
 
 OpenKeychain is an OpenPGP implementation for Android.