diff --git a/daemon.py b/daemon.py
index e7dbdf987..97977fc20 100644
--- a/daemon.py
+++ b/daemon.py
@@ -391,7 +391,7 @@ class PubServer(BaseHTTPRequestHandler):
             print('Inbox queue is full')
             return 1
 
-        #TODO convert headers to dict
+        # Convert the headers needed for signature verification to dict
         headersDict={}
         headersDict['host']=self.headers['host']
         if messageJson.get('actor'):
@@ -415,10 +415,9 @@ class PubServer(BaseHTTPRequestHandler):
                                  nickname, \
                                  self.server.domainFull, \
                                  messageJson,
-                                 self.headers['host'],
-                                 self.headers['signature'],
                                  headersDict,
-                                 '/'+self.path.split('/')[-1],
+                                 self.path,
+                                 #'/'+self.path.split('/')[-1],
                                  self.server.debug)
         if queueFilename:
             # add json to the queue
diff --git a/inbox.py b/inbox.py
index ffc5115b6..87eeacda3 100644
--- a/inbox.py
+++ b/inbox.py
@@ -164,7 +164,7 @@ def validPublishedDate(published) -> bool:
         return False
     return True
 
-def savePostToInboxQueue(baseDir: str,httpPrefix: str,nickname: str, domain: str,postJsonObject: {},host: str,headers: str,httpHeaders: {},postPath: str,debug: bool) -> str:
+def savePostToInboxQueue(baseDir: str,httpPrefix: str,nickname: str, domain: str,postJsonObject: {},httpHeaders: {},postPath: str,debug: bool) -> str:
     """Saves the give json to the inbox queue for the person
     keyId specifies the actor sending the post
     """
@@ -223,8 +223,6 @@ def savePostToInboxQueue(baseDir: str,httpPrefix: str,nickname: str, domain: str
         'postDomain': postDomain,
         'sharedInbox': sharedInboxItem,
         'published': published,
-        'host': host,
-        'headers': headers,
         'httpHeaders': httpHeaders,
         'path': postPath,
         'post': postJsonObject,