diff --git a/agents/kamagent.go b/agents/kamagent.go
index 272045c88..b29bd5cd2 100644
--- a/agents/kamagent.go
+++ b/agents/kamagent.go
@@ -108,8 +108,7 @@ func (ka *KamailioAgent) onCgrAuth(evData []byte, connID string) {
 			utils.KamailioAgent, kev[utils.OriginID]))
 		return
 	}
-	ipv4Addr := strings.Split(ka.conns[connID].RemoteAddr().String(), ":")[0]
-	authArgs.CGREvent.Event[utils.OriginHost] = ipv4Addr
+	authArgs.CGREvent.Event[utils.OriginHost] = strings.Split(ka.conns[connID].RemoteAddr().String(), ":")[0]
 	var authReply sessions.V1AuthorizeReply
 	err = ka.sessionS.Call(utils.SessionSv1AuthorizeEvent, authArgs, &authReply)
 	if kar, err := kev.AsKamAuthReply(authArgs, &authReply, err); err != nil {
@@ -144,8 +143,7 @@ func (ka *KamailioAgent) onCallStart(evData []byte, connID string) {
 		return
 	}
 	initSessionArgs.CGREvent.Event[EvapiConnID] = connID // Attach the connection ID so we can properly disconnect later
-	ipv4Addr := strings.Split(ka.conns[connID].RemoteAddr().String(), ":")[0]
-	initSessionArgs.CGREvent.Event[utils.OriginHost] = ipv4Addr
+	initSessionArgs.CGREvent.Event[utils.OriginHost] = strings.Split(ka.conns[connID].RemoteAddr().String(), ":")[0]
 	var initReply sessions.V1InitSessionReply
 	if err := ka.sessionS.Call(utils.SessionSv1InitiateSession,
 		initSessionArgs, &initReply); err != nil {
@@ -181,8 +179,7 @@ func (ka *KamailioAgent) onCallEnd(evData []byte, connID string) {
 		return
 	}
 	var reply string
-	ipv4Addr := strings.Split(ka.conns[connID].RemoteAddr().String(), ":")[0]
-	tsArgs.CGREvent.Event[utils.OriginHost] = ipv4Addr
+	tsArgs.CGREvent.Event[utils.OriginHost] = strings.Split(ka.conns[connID].RemoteAddr().String(), ":")[0]
 	if err := ka.sessionS.Call(utils.SessionSv1TerminateSession,
 		tsArgs, &reply); err != nil {
 		utils.Logger.Err(
@@ -195,8 +192,7 @@ func (ka *KamailioAgent) onCallEnd(evData []byte, connID string) {
 		if err != nil {
 			return
 		}
-		ipv4Addr := strings.Split(ka.conns[connID].RemoteAddr().String(), ":")[0]
-		cgrEv.Event[utils.OriginHost] = ipv4Addr
+		cgrEv.Event[utils.OriginHost] = strings.Split(ka.conns[connID].RemoteAddr().String(), ":")[0]
 		if err := ka.sessionS.Call(utils.SessionSv1ProcessCDR, *cgrEv, &reply); err != nil {
 			utils.Logger.Err(fmt.Sprintf("%s> failed processing CGREvent: %s, error: %s",
 				utils.KamailioAgent, utils.ToJSON(cgrEv), err.Error()))
diff --git a/sessions/sevent.go b/sessions/sevent.go
index 4b758a1ff..e53a1d8f0 100644
--- a/sessions/sevent.go
+++ b/sessions/sevent.go
@@ -310,7 +310,6 @@ func (self SMGenericEvent) GetOriginatorIP(fieldName string) string {
 }
 
 func (self SMGenericEvent) GetCdrSource() string {
-	fmt.Printf("Event %+v\n", self)
 	return utils.SMG + "_" + self.GetName()
 }