diff --git a/src/bitmessagecurses/__init__.py b/src/bitmessagecurses/__init__.py
index ff734e72..1030ebb0 100644
--- a/src/bitmessagecurses/__init__.py
+++ b/src/bitmessagecurses/__init__.py
@@ -919,7 +919,7 @@ def sendMessage(sender="", recv="", broadcast=None, subject="", body="", reply=F
         list(set(recvlist))         # Remove exact duplicates
         for addr in recvlist:
             if addr != "":
-                status, version, stream, ripe = decodeAddress(addr)
+                status, version, stream = decodeAddress(addr)[:3]
                 if status != "success":
                     set_background_title(d, "Recipient address error")
                     err = "Could not decode" + addr + " : " + status + "\n\n"
diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py
index 240324ef..f8c73ad7 100644
--- a/src/bitmessageqt/__init__.py
+++ b/src/bitmessageqt/__init__.py
@@ -2070,8 +2070,7 @@ class MyForm(settingsmixin.SMainWindow):
                                 ).arg(email)
                             )
                             return
-                    status, addressVersionNumber, streamNumber, ripe = decodeAddress(
-                        toAddress)
+                    status, addressVersionNumber, streamNumber = decodeAddress(toAddress)[:3]
                     if status != 'success':
                         try:
                             toAddress = unicode(toAddress, 'utf-8', 'ignore')
diff --git a/src/class_objectProcessor.py b/src/class_objectProcessor.py
index 0bec7454..97242a7f 100644
--- a/src/class_objectProcessor.py
+++ b/src/class_objectProcessor.py
@@ -29,7 +29,6 @@ from addresses import (
 )
 from bmconfigparser import BMConfigParser
 from fallback import RIPEMD160Hash
-from helper_ackPayload import genAckPayload
 from helper_sql import SqlBulkExecute, sqlExecute, sqlQuery
 from network import bmproto, knownnodes
 from network.node import Peer
diff --git a/src/tests/core.py b/src/tests/core.py
index 5c222fa4..3d8ac983 100644
--- a/src/tests/core.py
+++ b/src/tests/core.py
@@ -253,7 +253,7 @@ class TestCore(unittest.TestCase):
         )
         queryreturn = sqlQuery(
             '''select msgid from sent where ackdata=?''', result)
-        self.assertNotEqual(queryreturn[0][0] if queryreturn else '' , '')
+        self.assertNotEqual(queryreturn[0][0] if queryreturn else '', '')
 
         column_type = sqlQuery(
             '''select typeof(msgid) from sent where ackdata=?''', result)