diff --git a/package.json b/package.json
index b7276f2..883213e 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,16 @@
     "access": "public",
     "registry": "https://registry.npmjs.org"
   },
-  "author": "Milan Steiner <msteiner96@users.noreply.github.com>",
+  "contributors": [
+    {
+      "name": "Simon Warta",
+      "email": "webmaster128@users.noreply.github.com"
+    },
+    {
+      "name": "Milan Steiner",
+      "email": "msteiner96@users.noreply.github.com"
+    }
+  ],
   "license": "Apache-2.0",
   "bugs": {
     "url": "https://github.com/confio/cosmwasm.js/issues"
diff --git a/src/amino.ts b/src/amino.ts
index 899e648..94b2cc5 100644
--- a/src/amino.ts
+++ b/src/amino.ts
@@ -1,7 +1,6 @@
 export {
     pubkeyToAddress,
     pubkeyToRawAddress,
-    rawEd25519PubkeyToRawAddress,
     rawSecp256k1PubkeyToRawAddress,
     decodeAminoPubkey,
     decodeBech32Pubkey,
@@ -12,19 +11,13 @@ export {
     parseCoins,
     encodeBech32Pubkey,
     encodeSecp256k1Pubkey,
-    createMultisigThresholdPubkey,
     makeCosmoshubPath,
-    Ed25519Pubkey,
-    isEd25519Pubkey,
-    isMultisigThresholdPubkey,
     isSecp256k1Pubkey,
     isSinglePubkey,
-    MultisigThresholdPubkey,
     Pubkey,
     pubkeyType,
     Secp256k1Pubkey,
     SinglePubkey,
-    extractKdfConfiguration, 
     Secp256k1HdWallet, 
     Secp256k1HdWalletOptions,
     Secp256k1Wallet,
@@ -43,6 +36,4 @@ export {
     isStdTx, 
     makeStdTx, 
     StdTx,
-    executeKdf, 
-    KdfConfiguration
   } from "@cosmjs/amino";
\ No newline at end of file
diff --git a/src/cosmwasm-stargate.ts b/src/cosmwasm-stargate.ts
index 2fb52b3..a047358 100644
--- a/src/cosmwasm-stargate.ts
+++ b/src/cosmwasm-stargate.ts
@@ -4,6 +4,7 @@ export {
     InstantiateOptions,
     InstantiateResult,
     MigrateResult,
+    CosmWasmClient,
     SigningCosmWasmClient,
     SigningCosmWasmClientOptions,
     UploadResult,
diff --git a/src/crypto.ts b/src/crypto.ts
index e9a69c4..59a5452 100644
--- a/src/crypto.ts
+++ b/src/crypto.ts
@@ -1,34 +1,4 @@
 export {
-  Bip39,
-  EnglishMnemonic,
-  HashFunction,
-  Hmac,
-  Keccak256,
-  keccak256,
-  Argon2id,
-  Argon2idOptions,
-  Ed25519,
-  Ed25519Keypair,
-  isArgon2idOptions,
-  xchacha20NonceLength,
-  Xchacha20poly1305Ietf,
-  Random,
-  Ripemd160,
-  ripemd160,
-  Secp256k1,
-  Secp256k1Keypair,
-  ExtendedSecp256k1Signature,
-  Secp256k1Signature,
-  Sha256,
-  sha256,
-  Sha512,
-  sha512,
   HdPath,
   pathToString,
-  Slip10,
-  Slip10Curve,
-  slip10CurveFromString,
-  Slip10RawIndex,
-  Slip10Result,
-  stringToPath,
 } from "@cosmjs/crypto";
diff --git a/src/proto-signing.ts b/src/proto-signing.ts
index 73374f8..32ece1a 100644
--- a/src/proto-signing.ts
+++ b/src/proto-signing.ts
@@ -1,23 +1,6 @@
 export {
-  DecodedTxRaw,
-  decodeTxRaw,
   DirectSecp256k1HdWallet,
-  DirectSecp256k1HdWalletOptions,
-  DirectSecp256k1Wallet,
-  decodePubkey,
-  encodePubkey,
-  DecodeObject,
-  EncodeObject,
-  GeneratedType,
-  isPbjsGeneratedType,
-  isTsProtoGeneratedType,
-  isTxBodyEncodeObject,
-  PbjsGeneratedType,
   Registry,
-  TsProtoGeneratedType,
-  TxBodyEncodeObject,
-  DirectSignResponse,
-  isOfflineDirectSigner,
   OfflineDirectSigner,
   OfflineSigner
 } from "@cosmjs/proto-signing";
diff --git a/src/stargate.ts b/src/stargate.ts
index 867f036..ffaff59 100644
--- a/src/stargate.ts
+++ b/src/stargate.ts
@@ -1,103 +1,8 @@
 export {
-  AminoMsgBeginRedelegate,
-  AminoMsgCreateValidator,
-  AminoMsgDelegate,
-  AminoMsgDeposit,
-  AminoMsgEditValidator,
-  AminoMsgFundCommunityPool,
-  AminoMsgMultiSend,
-  AminoMsgSend,
-  AminoMsgSetWithdrawAddress,
-  AminoMsgSubmitEvidence,
-  AminoMsgSubmitProposal,
-  AminoMsgUndelegate,
-  AminoMsgUnjail,
-  AminoMsgVerifyInvariant,
-  AminoMsgVote,
-  AminoMsgWithdrawDelegatorReward,
-  AminoMsgWithdrawValidatorCommission,
-  isAminoMsgBeginRedelegate,
-  isAminoMsgCreateValidator,
-  isAminoMsgDelegate,
-  isAminoMsgDeposit,
-  isAminoMsgEditValidator,
-  isAminoMsgFundCommunityPool,
-  isAminoMsgMultiSend,
-  isAminoMsgSend,
-  isAminoMsgSetWithdrawAddress,
-  isAminoMsgSubmitEvidence,
-  isAminoMsgSubmitProposal,
-  isAminoMsgUndelegate,
-  isAminoMsgUnjail,
-  isAminoMsgVerifyInvariant,
-  isAminoMsgVote,
-  isAminoMsgWithdrawDelegatorReward,
-  isAminoMsgWithdrawValidatorCommission,
-  AminoConverter,
-  isMsgDelegateEncodeObject,
-  isMsgDepositEncodeObject,
-  isMsgSendEncodeObject,
-  isMsgSubmitProposalEncodeObject,
-  isMsgTransferEncodeObject,
-  isMsgUndelegateEncodeObject,
-  isMsgVoteEncodeObject,
-  isMsgWithdrawDelegatorRewardEncodeObject,
-  MsgDelegateEncodeObject,
-  MsgDepositEncodeObject,
-  MsgSendEncodeObject,
-  MsgSubmitProposalEncodeObject,
-  MsgTransferEncodeObject,
-  MsgUndelegateEncodeObject,
-  MsgVoteEncodeObject,
-  MsgWithdrawDelegatorRewardEncodeObject,
-  calculateFee,
-  GasPrice,
-  makeMultisignedTx,
-  AuthExtension,
-  BankExtension,
-  createPagination,
-  createProtobufRpcClient,
-  decodeCosmosSdkDecFromProto,
-  DistributionExtension,
-  GovExtension,
-  GovParamsType,
-  GovProposalId,
-  IbcExtension,
-  MintExtension,
-  MintParams,
-  ProtobufRpcClient,
-  QueryClient,
-  setupAuthExtension,
-  setupBankExtension,
-  setupDistributionExtension,
-  setupGovExtension,
-  setupIbcExtension,
-  setupMintExtension,
-  setupStakingExtension,
-  setupTxExtension,
-  StakingExtension,
-  TxExtension,
-  isSearchByHeightQuery,
-  isSearchBySentFromOrToQuery,
-  isSearchByTagsQuery,
-  SearchByHeightQuery,
-  SearchBySentFromOrToQuery,
-  SearchByTagsQuery,
-  SearchTxFilter,
-  SearchTxQuery,
-  defaultRegistryTypes,
-  SignerData,
-  SigningStargateClient,
-  SigningStargateClientOptions,
-  assertIsDeliverTxFailure,
-  assertIsDeliverTxSuccess,
-  Block,
-  BlockHeader,
-  DeliverTxResponse,
-  IndexedTx,
-  isDeliverTxFailure,
-  isDeliverTxSuccess,
-  SequenceResponse,
-  StargateClient,
-  TimeoutError,
+    IndexedTx,
+    StargateClient,
+    SigningStargateClient,
+    GasPrice,
+    QueryClient,
+    Block
 } from "@cosmjs/stargate";
diff --git a/tsconfig.json b/tsconfig.json
index 92265f7..7e71f8a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2018",
     "module": "commonjs",
     "declaration": true,
     "outDir": "./build",