diff --git a/build/ci.go b/build/ci.go
index c939f7672f..1e01a585b8 100644
--- a/build/ci.go
+++ b/build/ci.go
@@ -53,6 +53,7 @@ import (
 	"time"
 
 	"github.com/cespare/cp"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto/signify"
 	"github.com/ethereum/go-ethereum/internal/build"
@@ -225,6 +226,9 @@ func doInstall(cmdline []string) {
 	// We use -trimpath to avoid leaking local paths into the built executables.
 	gobuild.Args = append(gobuild.Args, "-trimpath")
 
+	// Add -race parameter
+	gobuild.Args = append(gobuild.Args, "-race")
+
 	// Show packages during build.
 	gobuild.Args = append(gobuild.Args, "-v")
 
diff --git a/core/state/state_object.go b/core/state/state_object.go
index ed0d7f21b5..2bf9dd2f4e 100644
--- a/core/state/state_object.go
+++ b/core/state/state_object.go
@@ -27,7 +27,6 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/metrics"
 	"github.com/ethereum/go-ethereum/rlp"
 	"github.com/ethereum/go-ethereum/trie"
@@ -179,10 +178,8 @@ func (s *stateObject) getOriginStorage(key common.Hash) (common.Hash, bool) {
 	}
 	// if L1 cache miss, try to get it from shared pool
 	if s.sharedOriginStorage != nil {
-		log.Info("debug: sharedOriginStorage enabled")
 		val, ok := s.sharedOriginStorage.Load(key)
 		if !ok {
-			log.Info("debug: get OriginStorage", "key", key, "value", val)
 			return common.Hash{}, false
 		}
 		s.originStorage[key] = val.(common.Hash)
@@ -193,7 +190,6 @@ func (s *stateObject) getOriginStorage(key common.Hash) (common.Hash, bool) {
 
 func (s *stateObject) setOriginStorage(key common.Hash, value common.Hash) {
 	if s.db.writeOnSharedStorage && s.sharedOriginStorage != nil {
-		log.Info("debug: set OriginStorage", "key", key, "value", value)
 		s.sharedOriginStorage.Store(key, value)
 	}
 	s.originStorage[key] = value