diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 9308be5bc..cb7ec9abe 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,6 +1,6 @@
 _Before filing a new issue, please **provide the following information**._
 
-- **OpenEthereum version**: 0.0.0
+- **OpenEthereum version (>=3.1.0)**: 0.0.0
 - **Operating system**: Windows / MacOS / Linux
 - **Installation**: homebrew / one-line installer / built from source
 - **Fully synchronized**: no / yes
diff --git a/Cargo.lock b/Cargo.lock
index 4d0ccc04c..2b13efd9a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1461,7 +1461,6 @@ dependencies = [
 name = "ethstore"
 version = "0.2.1"
 dependencies = [
- "dir",
  "ethereum-types 0.4.2",
  "ethkey",
  "itertools 0.5.10",
@@ -1480,7 +1479,6 @@ dependencies = [
  "smallvec 0.6.13",
  "tempdir",
  "time",
- "tiny-keccak 1.5.0",
 ]
 
 [[package]]
@@ -3005,7 +3003,7 @@ dependencies = [
  "rustc-hex 2.0.1",
  "scrypt 0.2.0",
  "sha2 0.8.0",
- "subtle 2.1.0",
+ "subtle 2.3.0",
  "tiny-keccak 1.5.0",
  "zeroize",
 ]
@@ -4458,9 +4456,9 @@ checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
 
 [[package]]
 name = "subtle"
-version = "2.1.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01dca13cf6c3b179864ab3292bd794e757618d35a7766b7c46050c614ba00829"
+checksum = "343f3f510c2915908f155e94f17220b19ccfacf2a64a2a5d8004f2c3e311e7fd"
 
 [[package]]
 name = "syn"
diff --git a/accounts/ethstore/Cargo.toml b/accounts/ethstore/Cargo.toml
index af497bcff..cdcae98e4 100644
--- a/accounts/ethstore/Cargo.toml
+++ b/accounts/ethstore/Cargo.toml
@@ -13,13 +13,11 @@ serde = "1.0"
 serde_json = "1.0"
 serde_derive = "1.0"
 rustc-hex = "1.0"
-tiny-keccak = "1.4"
 time = "0.1.34"
 itertools = "0.5"
 parking_lot = "0.7"
 parity-crypto = "0.3.0"
 ethereum-types = "0.4"
-dir = { path = "../../util/dir" }
 smallvec = "0.6"
 parity-wordlist = "1.3"
 tempdir = "0.3"
diff --git a/accounts/ethstore/src/lib.rs b/accounts/ethstore/src/lib.rs
index 0197229ca..5830ab998 100644
--- a/accounts/ethstore/src/lib.rs
+++ b/accounts/ethstore/src/lib.rs
@@ -18,7 +18,6 @@
 
 #![warn(missing_docs)]
 
-extern crate dir;
 extern crate itertools;
 extern crate libc;
 extern crate parking_lot;
@@ -29,7 +28,6 @@ extern crate serde_json;
 extern crate smallvec;
 extern crate tempdir;
 extern crate time;
-extern crate tiny_keccak;
 
 extern crate ethereum_types;
 extern crate ethkey as _ethkey;