diff --git a/sipp/xml/p2p_rtp/uas.xml b/sipp/xml/p2p_rtp/uas.xml
index d459e96..bbd4db0 100644
--- a/sipp/xml/p2p_rtp/uas.xml
+++ b/sipp/xml/p2p_rtp/uas.xml
@@ -70,12 +70,6 @@
 
   <recv request="ACK" crlf="true"> </recv>
 
-  <nop>
-    <action>
-      <exec rtp_echo="startaudio,0,PCMU/8000" />
-    </action>
-  </nop>
-
 
 
 
@@ -100,12 +94,6 @@
     ]]>
   </send>
 
-  <nop>
-    <action>
-      <exec rtp_echo="stopaudio,0,PCMU/8000" />
-    </action>
-  </nop>
-
 
 
 
diff --git a/sipp/xml/p2p_srtp/uas.xml b/sipp/xml/p2p_srtp/uas.xml
index 124e2e2..f3d07a0 100644
--- a/sipp/xml/p2p_srtp/uas.xml
+++ b/sipp/xml/p2p_srtp/uas.xml
@@ -52,9 +52,9 @@
       s=-
       c=IN IP[media_ip_type] [media_ip]
       t=0 0
-      m=audio [rtpstream_audio_port] RTP/SAVP 0 18 9 103 8 101
+      m=audio [media_port] RTP/SAVP 0 18 9 103 8 101
       a=crypto:[cryptotag1audio] [cryptosuiteaescm128sha1321audio] inline:[cryptokeyparams1audio]
-      a=rtcp:[rtpstream_audio_port+1]
+      a=rtcp:[media_port+1]
       a=sendrecv
       a=rtpmap:0 PCMU/8000
       a=rtpmap:18 G729/8000
@@ -71,12 +71,6 @@
 
   <recv request="ACK" crlf="true"> </recv>
 
-  <nop>
-    <action>
-      <exec rtp_echo="startaudio,0,PCMU/8000" />
-    </action>
-  </nop>
-
 
 
 
@@ -101,12 +95,6 @@
     ]]>
   </send>
 
-  <nop>
-    <action>
-      <exec rtp_echo="stopaudio,0,PCMU/8000" />
-    </action>
-  </nop>
-
 
 
 
diff --git a/sipp/xml/reg/uac.xml b/sipp/xml/reg/uac.xml
index 2a35554..5f0990e 100644
--- a/sipp/xml/reg/uac.xml
+++ b/sipp/xml/reg/uac.xml
@@ -37,7 +37,6 @@
     ]]>
   </send>
 
-  <recv response="100" optional="true"> </recv>
   <recv response="405" optional="true" next="got_err"> </recv>
   <recv response="401" optional="true" next="got_auth" auth="true"> </recv>
   <recv response="200" optional="false" next="done_auth" crlf="true"> </recv>
@@ -69,7 +68,6 @@
     ]]>
   </send>
 
-  <recv response="100" optional="true"> </recv>
   <recv response="405" optional="true" next="got_err"> </recv>
   <recv response="401" optional="true" next="done_auth"> </recv>
   <recv response="200" optional="false" next="done_all"> </recv>
diff --git a/sipp/xml/reg/uas.xml b/sipp/xml/reg/uas.xml
index 57db001..45bd269 100644
--- a/sipp/xml/reg/uas.xml
+++ b/sipp/xml/reg/uas.xml
@@ -38,9 +38,7 @@
   </send>
 
   <recv response="405" optional="true" next="got_err"> </recv>
-
   <recv response="401" optional="true" next="got_auth" auth="true"> </recv>
-
   <recv response="200" optional="false" next="done_auth" crlf="true"> </recv>
 
 
@@ -71,9 +69,7 @@
   </send>
 
   <recv response="405" optional="true" next="got_err"> </recv>
-
   <recv response="401" optional="true" next="done_auth"> </recv>
-
   <recv response="200" optional="false" next="done_all"> </recv>