diff --git a/Makefile b/Makefile
index ff0103d1..7cb9d01d 100644
--- a/Makefile
+++ b/Makefile
@@ -76,7 +76,7 @@ _before-cc:
 	CC_TEST_REPORTER_ID=${CC_TEST_REPORTER_ID} ./coverage/cc-test-reporter before-build
 	
 _after-cc:
-	CC_TEST_REPORTER_ID=${CC_TEST_REPORTER_ID} ./coverage/cc-test-reporter after-build --prefix ${CC_PREFIX}
+	GIT_COMMIT=$(git log | grep -m1 -oE '[^ ]+$') CC_TEST_REPORTER_ID=${CC_TEST_REPORTER_ID} ./coverage/cc-test-reporter after-build --prefix ${CC_PREFIX}
 
 test-ci: _before-cc test _after-cc
 
diff --git a/ci/Jenkinsfile b/ci/Jenkinsfile
deleted file mode 100644
index 88a98ac9..00000000
--- a/ci/Jenkinsfile
+++ /dev/null
@@ -1,94 +0,0 @@
-library 'status-jenkins-lib@v1.4.3'
-
-pipeline {
-  agent { label 'linux' }
-
-  options {
-    timestamps()
-    disableConcurrentBuilds()
-    /* Prevent Jenkins jobs from running forever */
-    timeout(time: 40, unit: 'MINUTES')
-    /* Limit builds retained */
-    buildDiscarder(logRotator(
-      numToKeepStr: '10',
-      daysToKeepStr: '30',
-      artifactNumToKeepStr: '10',
-    ))
-  }
-
-  /* WARNING: Defining parameters here with the ?: trick causes them to remember last value. */
-  parameters { 
-    booleanParam(
-      name: 'PUBLISH',
-      description: 'Trigger publishing of build results for nightly or release.',
-      defaultValue: getPublishDefault(params.PUBLISH),
-    )
-  }
-
-  stages {
-    stage('Build') {
-      parallel {
-        stage('iOS') { steps { script {
-          ios = jenkins.Build('go-waku/platforms/ios')
-        } } }
-        stage('Android') { steps { script {
-          android = jenkins.Build('go-waku/platforms/android')
-        } } }
-      }
-    }
-    stage('Archive') {
-      steps { script {
-        sh('rm -f pkg/*')
-        jenkins.copyArts(ios)
-        jenkins.copyArts(android)
-        sha = "pkg/${utils.pkgFilename(ext: 'sha256')}"
-        dir('pkg') {
-          /* generate sha256 checksums for upload */
-          sh "sha256sum * | tee ../${sha}"
-          archiveArtifacts('*')
-        }
-      } }
-    }
-    stage('Upload') {
-      steps { script {
-        /* object for easier URLs handling */
-        urls = [
-          /* mobile */
-          Android: utils.pkgUrl(android),
-        //  iOS: utils.pkgUrl(ios),
-          /* upload the sha256 checksums file too */
-          SHA: s3.uploadArtifact(sha),
-        ]
-        /* add URLs to the build description */
-        jenkins.setBuildDesc(urls)
-      } }
-    }
-    stage('Publish') {
-      when { expression { params.PUBLISH } }
-      steps { script {
-        github.publishReleaseFiles(repo: 'status-desktop');
-      } }
-    }
-  }
-}
-
-/* Helper that generates list of available choices for a parameter
- * but re-orders them based on the currently set value. First is default. */
-def List genChoices(String previousChoice, List defaultChoices) {
-  if (previousChoice == null) {
-     return defaultChoices
-  }
-  choices = defaultChoices.minus(previousChoice)
-  choices.add(0, previousChoice)
-  return choices
-}
-
-/* Helper that makes PUBLISH default to 'false' unless:
- * - The build is for a release branch
- * - A user explicitly specified a value
- * Since release builds create and re-create GitHub drafts every time. */
-def Boolean getPublishDefault(Boolean previousValue) {
-  if (env.JOB_NAME.startsWith('go-waku/release')) { return true }
-  if (previousValue != null) { return previousValue }
-  return false
-}
\ No newline at end of file
diff --git a/ci/Jenkinsfile.android b/ci/Jenkinsfile.android
index e3a0844a..e98e1950 100644
--- a/ci/Jenkinsfile.android
+++ b/ci/Jenkinsfile.android
@@ -46,8 +46,6 @@ pipeline {
       )
 
       sh 'make install-gomobile'
-
-      println("Output: ${env.ARTIFACT}")
     } } } }
 
     stage('Build') { steps { dir(env.REPO) {
diff --git a/ci/Jenkinsfile.old b/ci/Jenkinsfile.tests
similarity index 58%
rename from ci/Jenkinsfile.old
rename to ci/Jenkinsfile.tests
index 4c0704a2..6385d19f 100644
--- a/ci/Jenkinsfile.old
+++ b/ci/Jenkinsfile.tests
@@ -29,21 +29,6 @@ pipeline {
     stage('Test') {
       steps { sh 'make test-ci' }
     }
-
-    stage('Build example') {
-      steps { sh 'make build-example' }
-    }
-
-    stage('Build go-mobile') {
-      parallel {
-        stage('Linux') { steps { script {
-          linux = jenkins.Build('go-waku/platforms/linux')
-        } } }
-        stage('MacOS') { steps { script {
-          macos = jenkins.Build('go-waku/platforms/macos')
-        } } }
-      }
-    }
   }
   post {
     always { cleanWs() }
diff --git a/coverage/cc-test-reporter b/coverage/cc-test-reporter
index 28e36611..96f19b53 100755
Binary files a/coverage/cc-test-reporter and b/coverage/cc-test-reporter differ
diff --git a/waku/v2/node/wakunode2.go b/waku/v2/node/wakunode2.go
index e4792216..f85dd5c2 100644
--- a/waku/v2/node/wakunode2.go
+++ b/waku/v2/node/wakunode2.go
@@ -364,7 +364,7 @@ func (w *WakuNode) Stop() {
 	w.relay.Stop()
 	w.lightPush.Stop()
 	w.store.Stop()
-	w.stopRlnRelay()
+	_ = w.stopRlnRelay()
 
 	w.host.Close()
 
diff --git a/waku/v2/rest/relay.go b/waku/v2/rest/relay.go
index 93e63caf..b5ffc8a7 100644
--- a/waku/v2/rest/relay.go
+++ b/waku/v2/rest/relay.go
@@ -69,7 +69,7 @@ func (r *RelayService) Start() {
 	// Node may already be subscribed to some topics when Relay API handlers are installed. Let's add these
 	for _, topic := range r.node.Relay().Topics() {
 		r.log.Info("adding topic handler for existing subscription", zap.String("topic", topic))
-		r.messages[topic] = make([]*pb.WakuMessage, 0)
+		r.messages[topic] = []*pb.WakuMessage{}
 	}
 
 	r.runner.Start()
@@ -129,7 +129,7 @@ func (d *RelayService) postV1Subscriptions(w http.ResponseWriter, r *http.Reques
 		} else {
 			d.node.Broadcaster().Unregister(&topicToSubscribe, sub.C)
 
-			d.messages[topic] = make([]*pb.WakuMessage, 0)
+			d.messages[topic] = []*pb.WakuMessage{}
 		}
 	}
 
@@ -156,11 +156,11 @@ func (d *RelayService) getV1Messages(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	response := make([]*pb.WakuMessage, len(d.messages[topic]))
+	var response []*pb.WakuMessage
 	for i := range d.messages[topic] {
 		response = append(response, d.messages[topic][i])
 	}
-	d.messages[topic] = make([]*pb.WakuMessage, 0)
+	d.messages[topic] = []*pb.WakuMessage{}
 	writeErrOrResponse(w, nil, response)
 }