diff --git a/scenarios/invite_speeddial/scenario.yml b/scenarios/invite_speeddial/scenario.yml
new file mode 100644
index 00000000..fc33b941
--- /dev/null
+++ b/scenarios/invite_speeddial/scenario.yml
@@ -0,0 +1,41 @@
+scenarios:
+  - ip: 127.126.0.1
+    user: testuser1002
+    domain: spce.test
+    username: testuser1002
+    password: testuser
+    responders:
+      - ip: 127.1.0.3
+        number: 4311003
+        user: testuser1003
+        domain: spce.test
+        register: yes
+        username: testuser1003
+        password: testuser
+        active: yes
+  - ip: 127.126.0.1
+    user: testuser1002
+    domain: spce.test
+    username: testuser1002
+    password: testuser
+    responders:
+      - ip: 127.1.0.1
+        number: 4311001
+        user: testuser1001
+        domain: spce.test
+        register: yes
+        username: testuser1001
+        password: testuser
+        active: yes
+  - ip: 127.126.0.1
+    user: testuser1002
+    domain: spce.test
+    username: testuser1002
+    password: testuser
+    responders:
+  - ip: 127.126.0.1
+    user: testuser1002
+    domain: spce.test
+    username: testuser1002
+    password: testuser
+    responders:
diff --git a/scenarios/invite_speeddial/sipp_scenario00.xml b/scenarios/invite_speeddial/sipp_scenario00.xml
index ad4b9fc8..8aae0cf1 100644
--- a/scenarios/invite_speeddial/sipp_scenario00.xml
+++ b/scenarios/invite_speeddial/sipp_scenario00.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
 <scenario name="Sipwise NGCP Benchmark UAC Caller">
-  <send retrans="500" start_rtd="1" start_rtd="2">
+  <send start_rtd="1" start_rtd="2">
     <![CDATA[
 
       INVITE sip:*0@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
+      From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:*0@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 1 INVITE
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
       Content-Type: application/sdp
       Content-Length: [len]
@@ -37,29 +37,29 @@
 
       ACK sip:*0@[field3 file="callee.csv" line=0]:[remote_port] SIP/2.0
       [last_Via:]
-      From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
+      From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:*0@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 1 ACK
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
       Content-Length: 0
 
     ]]>
   </send>
 
-  <send retrans="500" start_rtd="3">
+  <send start_rtd="3">
     <![CDATA[
 
       INVITE sip:*0@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
+      From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:*0@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 2 INVITE
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
-      [field1 file="caller.csv"]
+      [field1 file="caller.csv" line=0]
       Content-Type: application/sdp
       Content-Length: [len]
 
@@ -92,12 +92,12 @@
 
       ACK [next_url] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
+      From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:*0@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: [call_id]
       [routes]
       CSeq: 2 ACK
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
       Content-Length: 0
 
@@ -113,16 +113,16 @@
   
   <pause milliseconds="1000"/> 
 
-  <send retrans="500" start_rtd="4">
+  <send start_rtd="4">
     <![CDATA[
 
       BYE [next_url] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
+      From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:*0@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 3 BYE
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       [routes]
       Max-Forwards: 70
       Content-Length: 0
diff --git a/scenarios/invite_speeddial/sipp_scenario01.xml b/scenarios/invite_speeddial/sipp_scenario01.xml
index 8b6679ae..1c88e64b 100644
--- a/scenarios/invite_speeddial/sipp_scenario01.xml
+++ b/scenarios/invite_speeddial/sipp_scenario01.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
 <scenario name="Sipwise NGCP Benchmark UAC Caller">
-  <send retrans="500" start_rtd="1" start_rtd="2">
+  <send start_rtd="1" start_rtd="2">
     <![CDATA[
 
       INVITE sip:*1@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
+      From: <sip:[field0 file="caller.csv" line=1]@[field2 file="caller.csv" line=1]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:*1@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 1 INVITE
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: sip:[field0 file="caller.csv" line=1]@[local_ip]:[local_port]
       Max-Forwards: 70
       Content-Type: application/sdp
       Content-Length: [len]
@@ -37,29 +37,29 @@
 
       ACK sip:*1@[field3 file="callee.csv" line=0]:[remote_port] SIP/2.0
       [last_Via:]
-      From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
+      From: <sip:[field0 file="caller.csv" line=1]@[field2 file="caller.csv" line=1]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:*1@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 1 ACK
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: sip:[field0 file="caller.csv" line=1]@[local_ip]:[local_port]
       Max-Forwards: 70
       Content-Length: 0
 
     ]]>
   </send>
 
-  <send retrans="500" start_rtd="3">
+  <send start_rtd="3">
     <![CDATA[
 
       INVITE sip:*1@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
+      From: <sip:[field0 file="caller.csv" line=1]@[field2 file="caller.csv" line=1]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:*1@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 2 INVITE
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: sip:[field0 file="caller.csv" line=1]@[local_ip]:[local_port]
       Max-Forwards: 70
-      [field1 file="caller.csv"]
+      [field1 file="caller.csv" line=1]
       Content-Type: application/sdp
       Content-Length: [len]
 
@@ -92,12 +92,12 @@
 
       ACK [next_url] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
+      From: <sip:[field0 file="caller.csv" line=1]@[field2 file="caller.csv" line=1]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:*1@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: [call_id]
       [routes]
       CSeq: 2 ACK
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: sip:[field0 file="caller.csv" line=1]@[local_ip]:[local_port]
       Max-Forwards: 70
       Content-Length: 0
 
@@ -113,16 +113,16 @@
   
   <pause milliseconds="1000"/> 
 
-  <send retrans="500" start_rtd="4">
+  <send start_rtd="4">
     <![CDATA[
 
       BYE [next_url] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
+      From: <sip:[field0 file="caller.csv" line=1]@[field2 file="caller.csv" line=1]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:*1@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 3 BYE
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: sip:[field0 file="caller.csv" line=1]@[local_ip]:[local_port]
       [routes]
       Max-Forwards: 70
       Content-Length: 0
diff --git a/scenarios/invite_speeddial/sipp_scenario02.xml b/scenarios/invite_speeddial/sipp_scenario02.xml
index 0de311fb..5067206b 100644
--- a/scenarios/invite_speeddial/sipp_scenario02.xml
+++ b/scenarios/invite_speeddial/sipp_scenario02.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
 <scenario name="Sipwise NGCP Benchmark UAC Caller">
-  <send retrans="500" start_rtd="1" start_rtd="2">
+  <send start_rtd="1" start_rtd="2">
     <![CDATA[
 
       INVITE sip:*2@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
+      From: <sip:[field0 file="caller.csv" line=2]@[field2 file="caller.csv" line=2]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:*2@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 1 INVITE
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: sip:[field0 file="caller.csv" line=2]@[local_ip]:[local_port]
       Max-Forwards: 70
       Content-Type: application/sdp
       Content-Length: [len]
@@ -37,11 +37,11 @@
 
       ACK sip:*2@[field3 file="callee.csv" line=0]:[remote_port] SIP/2.0
       [last_Via:]
-      From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
+      From: <sip:[field0 file="caller.csv" line=2]@[field2 file="caller.csv" line=2]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:*2@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 1 ACK
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: sip:[field0 file="caller.csv" line=2]@[local_ip]:[local_port]
       Max-Forwards: 70
       Content-Length: 0
 
@@ -53,13 +53,13 @@
 
       INVITE sip:*2@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
+      From: <sip:[field0 file="caller.csv" line=2]@[field2 file="caller.csv" line=2]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:*2@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 2 INVITE
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: sip:[field0 file="caller.csv" line=2]@[local_ip]:[local_port]
       Max-Forwards: 70
-      [field1 file="caller.csv"]
+      [field1 file="caller.csv" line=2]
       Content-Type: application/sdp
       Content-Length: [len]
 
@@ -92,12 +92,12 @@
 
       ACK [next_url] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
+      From: <sip:[field0 file="caller.csv" line=2]@[field2 file="caller.csv" line=2]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:*2@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: [call_id]
       [routes]
       CSeq: 2 ACK
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: sip:[field0 file="caller.csv" line=2]@[local_ip]:[local_port]
       Max-Forwards: 70
       Content-Length: 0
 
diff --git a/scenarios/invite_speeddial/sipp_scenario03.xml b/scenarios/invite_speeddial/sipp_scenario03.xml
index 4623f69c..7c9754e8 100644
--- a/scenarios/invite_speeddial/sipp_scenario03.xml
+++ b/scenarios/invite_speeddial/sipp_scenario03.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
 <scenario name="Sipwise NGCP Benchmark UAC Caller">
-  <send retrans="500" start_rtd="1" start_rtd="2">
+  <send start_rtd="1" start_rtd="2">
     <![CDATA[
 
       INVITE sip:*9@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
+      From: <sip:[field0 file="caller.csv" line=3]@[field2 file="caller.csv" line=3]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:*9@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 1 INVITE
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: sip:[field0 file="caller.csv" line=3]@[local_ip]:[local_port]
       Max-Forwards: 70
       Content-Type: application/sdp
       Content-Length: [len]
@@ -37,11 +37,11 @@
 
       ACK sip:*9@[field3 file="callee.csv" line=0]:[remote_port] SIP/2.0
       [last_Via:]
-      From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
+      From: <sip:[field0 file="caller.csv" line=3]@[field2 file="caller.csv" line=3]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:*9@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 1 ACK
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: sip:[field0 file="caller.csv" line=3]@[local_ip]:[local_port]
       Max-Forwards: 70
       Content-Length: 0
 
@@ -53,13 +53,13 @@
 
       INVITE sip:*9@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
+      From: <sip:[field0 file="caller.csv" line=3]@[field2 file="caller.csv" line=3]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:*9@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 2 INVITE
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: sip:[field0 file="caller.csv" line=3]@[local_ip]:[local_port]
       Max-Forwards: 70
-      [field1 file="caller.csv"]
+      [field1 file="caller.csv" line=3]
       Content-Type: application/sdp
       Content-Length: [len]
 
@@ -86,12 +86,12 @@
 
       ACK [next_url] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
+      From: <sip:[field0 file="caller.csv" line=3]@[field2 file="caller.csv" line=3]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:*9@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: [call_id]
       [routes]
       CSeq: 2 ACK
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: sip:[field0 file="caller.csv" line=3]@[local_ip]:[local_port]
       Max-Forwards: 70
       Content-Length: 0
 
diff --git a/scenarios/invite_speeddial/sipp_scenario_responder00_reg.xml b/scenarios/invite_speeddial/sipp_scenario_responder00_reg.xml
deleted file mode 100644
index d9cc4973..00000000
--- a/scenarios/invite_speeddial/sipp_scenario_responder00_reg.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Sipwise NGCP Benchmark UAS Registration">
-  <send>
-    <![CDATA[
-
-      REGISTER sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
-      Call-ID: [call_id]
-      CSeq: 1 REGISTER
-      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]
-      Expires: 600
-      Max-Forwards: 70
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <recv response="100"
-        optional="true">
-  </recv>
-  
-  <recv response="401" auth="true"/>
-  
-  <send>
-    <![CDATA[
-
-      REGISTER sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
-      Call-ID: [call_id]
-      CSeq: 2 REGISTER
-      [field2 file="callee.csv" line=0]
-      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]
-      Expires: 600
-      Max-Forwards: 70
-      Content-Length: 0
-
-    ]]>
-  </send>
-  
-  <recv response="100" optional="true">
-  </recv>
-
-  <recv response="200">
-  </recv>
-
-  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
-</scenario>
-
diff --git a/scenarios/invite_speeddial/sipp_scenario_responder00_unreg.xml b/scenarios/invite_speeddial/sipp_scenario_responder00_unreg.xml
deleted file mode 100644
index ec70b8d6..00000000
--- a/scenarios/invite_speeddial/sipp_scenario_responder00_unreg.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Sipwise NGCP Benchmark UAS Registration">
-  <send>
-    <![CDATA[
-
-      REGISTER sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
-      Call-ID: [call_id]
-      CSeq: 1 REGISTER
-      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]
-      Expires: 600
-      Max-Forwards: 70
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <recv response="100"
-        optional="true">
-  </recv>
-  
-  <recv response="401" auth="true"/>
-  
-  <send>
-    <![CDATA[
-
-      REGISTER sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
-      Call-ID: [call_id]
-      CSeq: 2 REGISTER
-      [field2 file="callee.csv" line=0]
-      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]
-      Expires: 0
-      Max-Forwards: 70
-      Content-Length: 0
-
-    ]]>
-  </send>
-  
-  <recv response="100" optional="true">
-  </recv>
-
-  <recv response="200">
-  </recv>
-
-  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
-</scenario>
-
diff --git a/scenarios/invite_speeddial/sipp_scenario_responder01_reg.xml b/scenarios/invite_speeddial/sipp_scenario_responder01_reg.xml
deleted file mode 100644
index 1189699a..00000000
--- a/scenarios/invite_speeddial/sipp_scenario_responder01_reg.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Sipwise NGCP Benchmark UAS Registration">
-  <send>
-    <![CDATA[
-
-      REGISTER sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>
-      Call-ID: [call_id]
-      CSeq: 1 REGISTER
-      Contact: sip:[field0 file="callee.csv" line=1]@[local_ip]:[local_port]
-      Expires: 600
-      Max-Forwards: 70
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <recv response="100"
-        optional="true">
-  </recv>
-  
-  <recv response="401" auth="true"/>
-  
-  <send>
-    <![CDATA[
-
-      REGISTER sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>
-      Call-ID: [call_id]
-      CSeq: 2 REGISTER
-      [field2 file="callee.csv" line=1]
-      Contact: sip:[field0 file="callee.csv" line=1]@[local_ip]:[local_port]
-      Expires: 600
-      Max-Forwards: 70
-      Content-Length: 0
-
-    ]]>
-  </send>
-  
-  <recv response="100" optional="true">
-  </recv>
-
-  <recv response="200">
-  </recv>
-
-  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
-</scenario>
-
diff --git a/scenarios/invite_speeddial/sipp_scenario_responder01_unreg.xml b/scenarios/invite_speeddial/sipp_scenario_responder01_unreg.xml
deleted file mode 100644
index b0f6f972..00000000
--- a/scenarios/invite_speeddial/sipp_scenario_responder01_unreg.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Sipwise NGCP Benchmark UAS Registration">
-  <send>
-    <![CDATA[
-
-      REGISTER sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>
-      Call-ID: [call_id]
-      CSeq: 1 REGISTER
-      Contact: sip:[field0 file="callee.csv" line=1]@[local_ip]:[local_port]
-      Expires: 600
-      Max-Forwards: 70
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <recv response="100"
-        optional="true">
-  </recv>
-  
-  <recv response="401" auth="true"/>
-  
-  <send>
-    <![CDATA[
-
-      REGISTER sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>
-      Call-ID: [call_id]
-      CSeq: 2 REGISTER
-      [field2 file="callee.csv" line=1]
-      Contact: sip:[field0 file="callee.csv" line=1]@[local_ip]:[local_port]
-      Expires: 0
-      Max-Forwards: 70
-      Content-Length: 0
-
-    ]]>
-  </send>
-  
-  <recv response="100" optional="true">
-  </recv>
-
-  <recv response="200">
-  </recv>
-
-  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
-</scenario>
-