diff --git a/packages/binary/serialize/serialized_object.go b/packages/binary/serialize/serialized_object.go
deleted file mode 100644
index f3ecab10fa541a24f290b761c44b8db8bb3123bc..0000000000000000000000000000000000000000
--- a/packages/binary/serialize/serialized_object.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package serialize
-
-import (
-	"reflect"
-	"unsafe"
-)
-
-type SerializedObject struct {
-	readOffset int
-}
-
-func (so *SerializedObject) SerializeInt(int int) []byte {
-	hdr := reflect.SliceHeader{Data: uintptr(unsafe.Pointer(&int)), Len: 8, Cap: 8}
-	return *(*[]byte)(unsafe.Pointer(&hdr))
-}
diff --git a/packages/binary/storageprefix/storageprefix.go b/packages/binary/storageprefix/storageprefix.go
index ff38affd4d7653e15347572f3cce8cb1c9cd56d7..fc9a8a21990a5bfaf13c435f9949b73d5a90e6c4 100644
--- a/packages/binary/storageprefix/storageprefix.go
+++ b/packages/binary/storageprefix/storageprefix.go
@@ -1,7 +1,7 @@
 package storageprefix
 
 var (
-	Mainnet = []byte{88}
+	MainNet = []byte{0}
 
 	TangleTransaction         = []byte{1}
 	TangleTransactionMetadata = []byte{2}
diff --git a/plugins/autopeering/autopeering.go b/plugins/autopeering/autopeering.go
index 436198b3bc22a9cbabe4c4c3d67c76915c8e978f..c02b8bf87d18bd47a48d0555e073a99b0b340eed 100644
--- a/plugins/autopeering/autopeering.go
+++ b/plugins/autopeering/autopeering.go
@@ -16,7 +16,9 @@ import (
 	"github.com/iotaledger/hive.go/logger"
 	"github.com/iotaledger/hive.go/node"
 
+	"github.com/iotaledger/goshimmer/packages/netutil"
 	"github.com/iotaledger/goshimmer/plugins/autopeering/local"
+	"github.com/iotaledger/goshimmer/plugins/cli"
 	"github.com/iotaledger/goshimmer/plugins/config"
 	"github.com/iotaledger/goshimmer/plugins/gossip"
 )
@@ -159,19 +161,17 @@ func parseEntryNodes() (result []*peer.Peer, err error) {
 }
 
 func checkConnection(localAddr *net.UDPAddr, self *peer.Peer) {
-	/*
-		peering := self.Services().Get(service.PeeringKey)
-		remoteAddr, err := net.ResolveUDPAddr(peering.Network(), peering.String())
-		if err != nil {
-			panic(err)
-		}
+	peering := self.Services().Get(service.PeeringKey)
+	remoteAddr, err := net.ResolveUDPAddr(peering.Network(), peering.String())
+	if err != nil {
+		panic(err)
+	}
 
-		// do not check the address as a NAT may change them for local connections
-		err = netutil.CheckUDP(localAddr, remoteAddr, false, true)
-		if err != nil {
-			log.Errorf("Error testing service: %s", err)
-			log.Panicf("Please check that %s is publicly reachable at %s/%s",
-				cli.AppName, peering.String(), peering.Network())
-		}
-	*/
+	// do not check the address as a NAT may change them for local connections
+	err = netutil.CheckUDP(localAddr, remoteAddr, false, true)
+	if err != nil {
+		log.Errorf("Error testing service: %s", err)
+		log.Panicf("Please check that %s is publicly reachable at %s/%s",
+			cli.AppName, peering.String(), peering.Network())
+	}
 }
diff --git a/plugins/gossip/gossip.go b/plugins/gossip/gossip.go
index 8c071f8c5414101e927aceb1817c9284efc2eda2..3697608d0a732f7cd097834c08879ed9423a10e0 100644
--- a/plugins/gossip/gossip.go
+++ b/plugins/gossip/gossip.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"net"
 	"strconv"
+	"sync"
 
 	"github.com/iotaledger/hive.go/autopeering/peer"
 	"github.com/iotaledger/hive.go/autopeering/peer/service"
@@ -13,6 +14,7 @@ import (
 	gp "github.com/iotaledger/goshimmer/packages/gossip"
 	"github.com/iotaledger/goshimmer/packages/gossip/server"
 	"github.com/iotaledger/goshimmer/plugins/autopeering/local"
+	"github.com/iotaledger/goshimmer/plugins/cli"
 	"github.com/iotaledger/goshimmer/plugins/config"
 	"github.com/iotaledger/goshimmer/plugins/tangle"
 )
@@ -82,27 +84,25 @@ func start(shutdownSignal <-chan struct{}) {
 }
 
 func checkConnection(srv *server.TCP, self *peer.Peer) {
-	/*
-		var wg sync.WaitGroup
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			conn, err := srv.AcceptPeer(self)
-			if err != nil {
-				return
-			}
-			_ = conn.Close()
-		}()
-		conn, err := srv.DialPeer(self)
+	var wg sync.WaitGroup
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
+		conn, err := srv.AcceptPeer(self)
 		if err != nil {
-			log.Errorf("Error testing: %s", err)
-			addr := self.Services().Get(service.GossipKey)
-			log.Panicf("Please check that %s is publicly reachable at %s/%s",
-				cli.AppName, addr.String(), addr.Network())
+			return
 		}
 		_ = conn.Close()
-		wg.Wait()
-	*/
+	}()
+	conn, err := srv.DialPeer(self)
+	if err != nil {
+		log.Errorf("Error testing: %s", err)
+		addr := self.Services().Get(service.GossipKey)
+		log.Panicf("Please check that %s is publicly reachable at %s/%s",
+			cli.AppName, addr.String(), addr.Network())
+	}
+	_ = conn.Close()
+	wg.Wait()
 }
 
 func getTransaction(transactionId transaction.Id) (bytes []byte, err error) {
diff --git a/plugins/tangle/plugin.go b/plugins/tangle/plugin.go
index 8edf6459f4cdd8206732e2e1487914a16698d860..53c0dc441405b5da3e8b5632d75177d0e9fe94f0 100644
--- a/plugins/tangle/plugin.go
+++ b/plugins/tangle/plugin.go
@@ -38,7 +38,7 @@ func configure(*node.Plugin) {
 	TransactionParser = transactionparser.New()
 	TransactionRequester = transactionrequester.New()
 	TipSelector = tipselector.New()
-	Instance = tangle.New(database.GetBadgerInstance(), storageprefix.Mainnet)
+	Instance = tangle.New(database.GetBadgerInstance(), storageprefix.MainNet)
 
 	// setup TransactionParser
 	TransactionParser.Events.TransactionParsed.Attach(events.NewClosure(func(transaction *transaction.Transaction) {
diff --git a/plugins/webapi/spammer/plugin.go b/plugins/webapi/spammer/plugin.go
index 7bd38432c88dda4a3a9730202a6987f5c1675663..a5d9345bdfa5f8bffcddb1c501c6dc12ae9fc19d 100644
--- a/plugins/webapi/spammer/plugin.go
+++ b/plugins/webapi/spammer/plugin.go
@@ -10,7 +10,7 @@ import (
 
 var transactionSpammer *spammer.Spammer
 
-var PLUGIN = node.NewPlugin("Spammer", node.Enabled, configure)
+var PLUGIN = node.NewPlugin("Spammer", node.Disabled, configure)
 
 func configure(plugin *node.Plugin) {
 	transactionSpammer = spammer.New(tangle.Instance, tangle.TipSelector)