diff --git a/.appveyor.yml b/.appveyor.yml
index 98df7f0c6..5878cd688 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -34,9 +34,8 @@ build_script:
   - mingw32-make -j2 ARCH_OVERRIDE=%PLATFORM% fetch-dlls
 
 test_script:
-  # the "go-checks" target fails in AppVeyor, for some reason; easier to disable than to debug
-  - mingw32-make -j2 ARCH_OVERRIDE=%PLATFORM% DISABLE_GO_CHECKS=1 LOG_LEVEL=TRACE
-  - mingw32-make -j2 ARCH_OVERRIDE=%PLATFORM% DISABLE_GO_CHECKS=1 LOG_LEVEL=TRACE NIMFLAGS="-d:testnet_servers_image"
-  - mingw32-make -j2 ARCH_OVERRIDE=%PLATFORM% DISABLE_TEST_FIXTURES_SCRIPT=1 DISABLE_GO_CHECKS=1 test
+  - mingw32-make -j2 ARCH_OVERRIDE=%PLATFORM% LOG_LEVEL=TRACE
+  - mingw32-make -j2 ARCH_OVERRIDE=%PLATFORM% LOG_LEVEL=TRACE NIMFLAGS="-d:testnet_servers_image"
+  - mingw32-make -j2 ARCH_OVERRIDE=%PLATFORM% DISABLE_TEST_FIXTURES_SCRIPT=1 test
 
 deploy: off
diff --git a/.gitignore b/.gitignore
index b80176e32..4162c4ca0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,10 +6,6 @@ build/
 # Nimble packages
 /vendor/.nimble
 
-# Go packages
-/vendor/go
-!/vendor/go/src/github.com/libp2p/go-libp2p-daemon
-
 # ntags/ctags output
 /tags
 
diff --git a/.gitmodules b/.gitmodules
index 73bedb8ff..f47810534 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,11 +3,6 @@
 	url = https://github.com/status-im/nim-eth2-scenarios
 	ignore = dirty
 	branch = master
-[submodule "vendor/go/src/github.com/libp2p/go-libp2p-daemon"]
-	path = vendor/go/src/github.com/libp2p/go-libp2p-daemon
-	url = https://github.com/libp2p/go-libp2p-daemon.git
-	ignore = dirty
-	branch = master
 [submodule "vendor/nim-blscurve"]
 	path = vendor/nim-blscurve
 	url = https://github.com/status-im/nim-blscurve.git
diff --git a/.travis.yml b/.travis.yml
index b045ec565..27c21bda4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-language: go
+language: c
 
 dist: bionic
 
@@ -6,16 +6,12 @@ dist: bionic
 cache:
   directories:
     - vendor/nimbus-build-system/vendor/Nim/bin
-    - vendor/go/bin
     - jsonTestsCache
 
 git:
   # when multiple CI builds are queued, the tested commit needs to be in the last X commits cloned with "--depth X"
   depth: 10
 
-go:
-  - "1.12.x"
-
 matrix:
   include:
     - os: linux
diff --git a/Jenkinsfile b/Jenkinsfile
index c1c8929e6..fbfb0d606 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -7,7 +7,6 @@ def runStages() {
 
 		cache(maxCacheSize: 250, caches: [
 			[$class: "ArbitraryFileCache", excludes: "", includes: "**/*", path: "${WORKSPACE}/vendor/nimbus-build-system/vendor/Nim/bin"],
-			[$class: "ArbitraryFileCache", excludes: "", includes: "**/*", path: "${WORKSPACE}/vendor/go/bin"],
 			[$class: "ArbitraryFileCache", excludes: "", includes: "**/*", path: "${WORKSPACE}/jsonTestsCache"]
 		]) {
 			stage("Build") {
diff --git a/vendor/go/src/github.com/libp2p/go-libp2p-daemon b/vendor/go/src/github.com/libp2p/go-libp2p-daemon
deleted file mode 160000
index cd8b111a1..000000000
--- a/vendor/go/src/github.com/libp2p/go-libp2p-daemon
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cd8b111a1ae4c2bdc02d0cdc3a78cb3d9977849a
diff --git a/vendor/nimbus-build-system b/vendor/nimbus-build-system
index 0cce46e12..3ff26b54e 160000
--- a/vendor/nimbus-build-system
+++ b/vendor/nimbus-build-system
@@ -1 +1 @@
-Subproject commit 0cce46e1260b053349d0d6f337f5d67a7bc14462
+Subproject commit 3ff26b54ebc2b1bc06d29af8043c3ac8ee4145a3