diff --git a/packages/keychain/src/types/bs58check.d.ts b/packages/keychain/src/types/bs58check.d.ts
deleted file mode 100644
index fa08d8a6..00000000
--- a/packages/keychain/src/types/bs58check.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-declare module 'bs58check' {
-  export function encode(buf: Buffer): string
-  export function decode(str: string): Buffer
-
-  export default {
-    encode,
-    decode
-  }
-}
diff --git a/packages/keychain/src/types/crypto-browserify.d.ts b/packages/keychain/src/types/crypto-browserify.d.ts
index c639ea68..74aa9225 100644
--- a/packages/keychain/src/types/crypto-browserify.d.ts
+++ b/packages/keychain/src/types/crypto-browserify.d.ts
@@ -3,10 +3,21 @@ interface Hash {
   digest(encoding: string): string
 }
 
+interface Cipher {
+  update(data: string | Buffer, inputEncoding: string, outputEncoding: string): string
+  final(outputEncoding: string): string
+}
+
+interface Hmac {
+  write(data: string | Buffer): Hmac
+  digest(encoding: string): string
+  digest(): Buffer
+}
+
 declare module 'crypto-browserify' {
   export function randomBytes(size: number): Buffer
   export function pbkdf2Sync(password: string, salt: Buffer, iterations: number, keylen: number, digest: string): Buffer
-  export function createCipheriv(algorithm: string, key: string | Buffer, iv: string | Buffer)
-  export function createHmac(algorithm: string, key: string | Buffer)
+  export function createCipheriv(algorithm: string, key: string | Buffer, iv: string | Buffer): Cipher
+  export function createHmac(algorithm: string, key: string | Buffer): Hmac
   export function createHash(algorithm: string): Hash
 }
diff --git a/packages/keychain/src/wallet.ts b/packages/keychain/src/wallet.ts
index 53484da2..6bd5fba3 100644
--- a/packages/keychain/src/wallet.ts
+++ b/packages/keychain/src/wallet.ts
@@ -1,9 +1,8 @@
 import { generateMnemonic, mnemonicToSeed, validateMnemonic } from 'bip39'
 import { fromSeed, BIP32Interface } from 'bip32'
-import { randomBytes } from 'crypto'
+import { randomBytes } from 'crypto-browserify'
 
 import { encrypt, getBlockchainIdentities, IdentityKeyPair } from './utils'
-import HDNode from './hdnode'
 
 interface ConstructorOptions {
   identityPublicKeychain: string