diff --git a/crypto/eecdh.go b/crypto/eecdh.go
index 31a3bc8..83862b1 100644
--- a/crypto/eecdh.go
+++ b/crypto/eecdh.go
@@ -10,7 +10,6 @@ import(
     "golang.org/x/crypto/pbkdf2"
     "errors"
     "math/big"
-    "fmt"
 )
 
 const(
@@ -63,8 +62,6 @@ func EncryptMessage(clearText, aesKey, nxt []byte, sid, rid int) (msg *Encrypted
         return nil, err
     }
 
-    fmt.Println(nxt)
-
     // Add PKCS7 padding to clearText
     paddedClearText, err := PKCS7Pad(clearText, aes.BlockSize)
     if err != nil {
@@ -157,8 +154,6 @@ func (message *EncryptedMessage) Decrypt(aesKey []byte) (clearText, nextKey []by
         return
     }
 
-    fmt.Println(nxt)
-
     return msg, nxt, err
 }
 
diff --git a/db/db.go b/db/db.go
index ad328e4..9eaac8a 100644
--- a/db/db.go
+++ b/db/db.go
@@ -107,11 +107,17 @@ func LatestPrivKey(owner, peer string) (id int) {
 }
 
 func UploadPubKey(owner, peer string, pubkey []byte, id int) error {
+    if _, err := LookupPubKey(owner, peer, id); err == nil {
+        return nil
+    }
     _, err := db.Exec(`INSERT INTO pubkeys (id, owner, peer, pubkey) VALUES (?, ?, ?, ?)`, id, owner, peer, pubkey)
     return err
 }
 
 func UploadPrivKey(owner, peer string, privkey []byte, id int) error {
+    if _, err := LookupPrivKey(owner, peer, id); err == nil {
+        return nil
+    }
     _, err := db.Exec(`INSERT INTO privkeys (id, owner, peer, privkey) VALUES (?, ?, ?, ?)`, id, owner, peer, privkey)
     return err
 }