diff --git a/pkg/acl/acltree/acltree_test.go b/pkg/acl/acltree/acltree_test.go
index f8313df4..e9a72226 100644
--- a/pkg/acl/acltree/acltree_test.go
+++ b/pkg/acl/acltree/acltree_test.go
@@ -67,14 +67,12 @@ func TestACLTree_UserJoinUpdate_Append(t *testing.T) {
 
 	// Use this for key generation
 	//encryptionDecoder := keys.NewKeyDecoder(func(bytes []byte) (keys.Key, error) {
-	//	key, err := encryptionkey.NewEncryptionRsaPrivKeyFromBytes(bytes)
-	//	return key, err
+	//	return encryptionkey.NewEncryptionRsaPrivKeyFromBytes(bytes)
 	//})
 	//encodedEncryptionKey, _ := encryptionDecoder.EncodeToString(keychain.EncryptionKeys["A"])
 	//
 	//signingDecoder := keys.NewKeyDecoder(func(bytes []byte) (keys.Key, error) {
-	//	key, err := signingkey.NewSigningEd25519PrivKeyFromBytes(bytes)
-	//	return key, err
+	//	return signingkey.NewSigningEd25519PrivKeyFromBytes(bytes)
 	//})
 	//encodedSigningKey, _ := signingDecoder.EncodeToString(keychain.SigningKeys["A"])
 	//
diff --git a/service/account/service.go b/service/account/service.go
index 3363379d..b64a6a83 100644
--- a/service/account/service.go
+++ b/service/account/service.go
@@ -40,12 +40,10 @@ func NewFromFile(path string) (app.Component, error) {
 		return nil, err
 	}
 	privateEncryptionDecoder := keys.NewKeyDecoder(func(bytes []byte) (keys.Key, error) {
-		key, err := encryptionkey.NewEncryptionRsaPrivKeyFromBytes(bytes)
-		return key, err
+		return encryptionkey.NewEncryptionRsaPrivKeyFromBytes(bytes)
 	})
 	privateSigningDecoder := keys.NewKeyDecoder(func(bytes []byte) (keys.Key, error) {
-		key, err := signingkey.NewSigningEd25519PrivKeyFromBytes(bytes)
-		return key, err
+		return signingkey.NewSigningEd25519PrivKeyFromBytes(bytes)
 	})
 	// TODO: Convert this to new decoder
 	publicSigningDecoder := signingkey.NewEd25519PubKeyDecoder()