diff --git a/Makefile b/Makefile
index c768b96b73846faf5dfc619e6d0df019b6979cb5..aec2aaaa957a040cf3a03469a5d263f3b3f37e60 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ update_release:
 	GOFLAGS="" go get gitlab.com/xx_network/crypto@release
 	GOFLAGS="" go get gitlab.com/elixxir/crypto@release
 	GOFLAGS="" go get gitlab.com/xx_network/comms@release
-	GOFLAGS="" go get gitlab.com/elixxir/comms@"hotfix/clientErrorSource"
+	GOFLAGS="" go get gitlab.com/elixxir/comms@release
 
 update_master:
 	GOFLAGS="" go get gitlab.com/xx_network/primitives@master
diff --git a/network/follow.go b/network/follow.go
index dff6b589a5dcf7a798ea35270e1c19f89b9f9f4b..0262bf708b3f55f20901a3d5fe3189b37ca343e2 100644
--- a/network/follow.go
+++ b/network/follow.go
@@ -168,18 +168,11 @@ func (m *manager) follow(report interfaces.ClientErrorReport, rng csprng.Source,
 				if bytes.Equal(clientErr.ClientId, m.Session.GetUser().TransmissionID.Marshal()) {
 
 					// Obtain relevant NodeGateway information
-					// TODO ???
 					nid, err := id.Unmarshal(clientErr.Source)
 					if err != nil {
 						jww.ERROR.Printf("Unable to get NodeID: %+v", err)
 						return
 					}
-					//m.Instance.GetNodeAndGateway(gwHost.GetId())
-					//if err != nil {
-					//	jww.ERROR.Printf("Unable to get NodeGateway: %+v", err)
-					//	return
-					//}
-					//nid, err := nGw.Node.GetNodeId()
 					nGw, err := m.Instance.GetNodeAndGateway(nid)
 					if err != nil {
 						jww.ERROR.Printf("Unable to get gateway: %+v", err)