--- a/upmpd/ConnectionManager.xml
+++ b/upmpd/ConnectionManager.xml
@@ -68,55 +68,13 @@
             <argumentList>
                 <argument>
                     <name>Source</name>
-                    <direction>out</direction>               <relatedStateVariable>SourceProtocolInfo</relatedStateVariable>
+                    <direction>out</direction>               
+		    <relatedStateVariable>SourceProtocolInfo</relatedStateVariable>
                 </argument>
                 <argument>
                     <name>Sink</name>
-                    <direction>out</direction>               <relatedStateVariable>SinkProtocolInfo</relatedStateVariable>
-                </argument>
-            </argumentList>
-        </action>
-	  <action>
-	  <Optional/>
-            <name>PrepareForConnection</name>
-            <argumentList>
-                <argument>
-                    <name>RemoteProtocolInfo</name>
-                    <direction>in</direction>                    <relatedStateVariable>A_ARG_TYPE_ProtocolInfo</relatedStateVariable>
-                </argument>
-                <argument>
-                    <name>PeerConnectionManager</name>
-                    <direction>in</direction>                  <relatedStateVariable>A_ARG_TYPE_ConnectionManager</relatedStateVariable>
-                </argument>
-                <argument>
-                    <name>PeerConnectionID</name>
-                    <direction>in</direction>                    <relatedStateVariable>A_ARG_TYPE_ConnectionID</relatedStateVariable>
-                </argument>
-                <argument>
-                    <name>Direction</name>
-                    <direction>in</direction>                    <relatedStateVariable>A_ARG_TYPE_Direction</relatedStateVariable>
-                </argument>
-                <argument>
-                    <name>ConnectionID</name>
-                    <direction>out</direction>                    <relatedStateVariable>A_ARG_TYPE_ConnectionID</relatedStateVariable>
-                </argument>
-                <argument>
-                    <name>AVTransportID</name>
-                    <direction>out</direction>                    <relatedStateVariable>A_ARG_TYPE_AVTransportID</relatedStateVariable>
-                </argument>
-                <argument>
-                    <name>RcsID</name>
-                    <direction>out</direction>                    <relatedStateVariable>A_ARG_TYPE_RcsID</relatedStateVariable>
-                </argument>
-            </argumentList>
-        </action>
-        <action>
-	  <Optional/>
-            <name>ConnectionComplete</name>
-            <argumentList>
-                <argument>
-                    <name>ConnectionID</name>
-                    <direction>in</direction>                    <relatedStateVariable>A_ARG_TYPE_ConnectionID</relatedStateVariable>
+                    <direction>out</direction>
+		    <relatedStateVariable>SinkProtocolInfo</relatedStateVariable>
                 </argument>
             </argumentList>
         </action>
@@ -125,7 +83,8 @@
             <argumentList>
                 <argument>
                     <name>ConnectionIDs</name>
-                    <direction>out</direction>                    <relatedStateVariable>CurrentConnectionIDs</relatedStateVariable>
+                    <direction>out</direction>
+                    <relatedStateVariable>CurrentConnectionIDs</relatedStateVariable>
                 </argument>
             </argumentList>
         </action>
@@ -134,35 +93,43 @@
             <argumentList>
                 <argument>
                     <name>ConnectionID</name>
-                    <direction>in</direction>                   <relatedStateVariable>A_ARG_TYPE_ConnectionID</relatedStateVariable>
+                    <direction>in</direction>
+                    <relatedStateVariable>A_ARG_TYPE_ConnectionID</relatedStateVariable>
                 </argument>
                 <argument>
                     <name>RcsID</name>
-                    <direction>out</direction>                    <relatedStateVariable>A_ARG_TYPE_RcsID</relatedStateVariable>
+                    <direction>out</direction>
+                    <relatedStateVariable>A_ARG_TYPE_RcsID</relatedStateVariable>
                 </argument>
                 <argument>
                     <name>AVTransportID</name>
-                    <direction>out</direction>                    <relatedStateVariable>A_ARG_TYPE_AVTransportID</relatedStateVariable>
+                    <direction>out</direction>
+                    <relatedStateVariable>A_ARG_TYPE_AVTransportID</relatedStateVariable>
                 </argument>
                 <argument>
                     <name>ProtocolInfo</name>
-                    <direction>out</direction>                    <relatedStateVariable>A_ARG_TYPE_ProtocolInfo</relatedStateVariable>
+                    <direction>out</direction>
+                    <relatedStateVariable>A_ARG_TYPE_ProtocolInfo</relatedStateVariable>
                 </argument>
                 <argument>
                     <name>PeerConnectionManager</name>
-                    <direction>out</direction>                    <relatedStateVariable>A_ARG_TYPE_ConnectionManager</relatedStateVariable>
+                    <direction>out</direction>
+                    <relatedStateVariable>A_ARG_TYPE_ConnectionManager</relatedStateVariable>
                 </argument>
              <argument>
                     <name>PeerConnectionID</name>
-                    <direction>out</direction>                   <relatedStateVariable>A_ARG_TYPE_ConnectionID</relatedStateVariable>
+                    <direction>out</direction>
+                    <relatedStateVariable>A_ARG_TYPE_ConnectionID</relatedStateVariable>
                 </argument>
                 <argument>
                     <name>Direction</name>
-                    <direction>out</direction>                    <relatedStateVariable>A_ARG_TYPE_Direction</relatedStateVariable>
+                    <direction>out</direction>
+                    <relatedStateVariable>A_ARG_TYPE_Direction</relatedStateVariable>
                 </argument>
                 <argument>
                     <name>Status</name>
-                    <direction>out</direction>                    <relatedStateVariable>A_ARG_TYPE_ConnectionStatus</relatedStateVariable>
+                    <direction>out</direction>
+                    <relatedStateVariable>A_ARG_TYPE_ConnectionStatus</relatedStateVariable>
                 </argument>
             </argumentList>
         </action>