diff --git a/appveyor.yml b/appveyor.yml
index 4a8c4b737a..114aec644b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -54,4 +54,4 @@ for:
       - go run build/ci.go archive -arch %GETH_ARCH% -type zip -signer WINDOWS_SIGNING_KEY -upload gethstore/builds
       - go run build/ci.go nsis -arch %GETH_ARCH% -signer WINDOWS_SIGNING_KEY -upload gethstore/builds
     test_script:
-      - go run build/ci.go test -dlgo -arch %GETH_ARCH% -cc %GETH_CC% -short
+      - go run build/ci.go test -dlgo -arch %GETH_ARCH% -cc %GETH_CC%
diff --git a/build/ci.go b/build/ci.go
index 46f1ac2812..1ff3fb5bf8 100644
--- a/build/ci.go
+++ b/build/ci.go
@@ -285,7 +285,6 @@ func doTest(cmdline []string) {
 		coverage = flag.Bool("coverage", false, "Whether to record code coverage")
 		verbose  = flag.Bool("v", false, "Whether to log verbosely")
 		race     = flag.Bool("race", false, "Execute the race detector")
-		short     = flag.Bool("short", false, "Pass the 'short'-flag to go test")
 		cachedir = flag.String("cachedir", "./build/cache", "directory for caching downloads")
 	)
 	flag.CommandLine.Parse(cmdline)
@@ -319,9 +318,6 @@ func doTest(cmdline []string) {
 	if *race {
 		gotest.Args = append(gotest.Args, "-race")
 	}
-	if *short {
-		gotest.Args = append(gotest.Args, "-short")
-	}
 
 	packages := []string{"./..."}
 	if len(flag.CommandLine.Args()) > 0 {
diff --git a/core/blockchain.go b/core/blockchain.go
index fc5c249ce2..baf2f9f82f 100644
--- a/core/blockchain.go
+++ b/core/blockchain.go
@@ -989,7 +989,6 @@ func (bc *BlockChain) Stop() {
 		if snapBase, err = bc.snaps.Journal(bc.CurrentBlock().Root); err != nil {
 			log.Error("Failed to journal state snapshot", "err", err)
 		}
-		bc.snaps.Release()
 	}
 	if bc.triedb.Scheme() == rawdb.PathScheme {
 		// Ensure that the in-memory trie nodes are journaled to disk properly.
diff --git a/core/state/snapshot/disklayer.go b/core/state/snapshot/disklayer.go
index d563b67ca4..513f0f5aba 100644
--- a/core/state/snapshot/disklayer.go
+++ b/core/state/snapshot/disklayer.go
@@ -45,16 +45,6 @@ type diskLayer struct {
 	lock sync.RWMutex
 }
 
-// Release releases underlying resources; specifically the fastcache requires
-// Reset() in order to not leak memory.
-// OBS: It does not invoke Close on the diskdb
-func (dl *diskLayer) Release() error {
-	if dl.cache != nil {
-		dl.cache.Reset()
-	}
-	return nil
-}
-
 // Root returns  root hash for which this snapshot was made.
 func (dl *diskLayer) Root() common.Hash {
 	return dl.root
diff --git a/core/state/snapshot/snapshot.go b/core/state/snapshot/snapshot.go
index 6389842382..e30a0005cc 100644
--- a/core/state/snapshot/snapshot.go
+++ b/core/state/snapshot/snapshot.go
@@ -656,13 +656,6 @@ func diffToDisk(bottom *diffLayer) *diskLayer {
 	return res
 }
 
-// Release releases resources
-func (t *Tree) Release() {
-	if dl := t.disklayer(); dl != nil {
-		dl.Release()
-	}
-}
-
 // Journal commits an entire diff hierarchy to disk into a single journal entry.
 // This is meant to be used during shutdown to persist the snapshot without
 // flattening everything down (bad for reorgs).
diff --git a/tests/state_test_util.go b/tests/state_test_util.go
index 745a3c6b28..8c255c1b5b 100644
--- a/tests/state_test_util.go
+++ b/tests/state_test_util.go
@@ -200,9 +200,6 @@ func (t *StateTest) Run(subtest StateSubtest, vmconfig vm.Config, snapshotter bo
 		if triedb != nil {
 			triedb.Close()
 		}
-		if snaps != nil {
-			snaps.Release()
-		}
 	}()
 	checkedErr := t.checkError(subtest, err)
 	if checkedErr != nil {