Index: /trunk/autoquest-plugin-uml/src/main/java/de/ugoe/cs/autoquest/plugin/uml/UMLUtils.java
===================================================================
--- /trunk/autoquest-plugin-uml/src/main/java/de/ugoe/cs/autoquest/plugin/uml/UMLUtils.java	(revision 2004)
+++ /trunk/autoquest-plugin-uml/src/main/java/de/ugoe/cs/autoquest/plugin/uml/UMLUtils.java	(revision 2005)
@@ -53,5 +53,4 @@
 import org.eclipse.uml2.uml.LiteralBoolean;
 import org.eclipse.uml2.uml.LiteralInteger;
-import org.eclipse.uml2.uml.LiteralNull;
 import org.eclipse.uml2.uml.LiteralReal;
 import org.eclipse.uml2.uml.LiteralString;
@@ -60,5 +59,4 @@
 import org.eclipse.uml2.uml.MessageSort;
 import org.eclipse.uml2.uml.Model;
-import org.eclipse.uml2.uml.NamedElement;
 import org.eclipse.uml2.uml.Operation;
 import org.eclipse.uml2.uml.Package;
@@ -459,10 +457,4 @@
         }
         for (Property property : fetchAllTestComponentProperties(testContext)) {
-            // TODO check if this is still required
-            /*
-             * if (userLifeline != null) { throw new RuntimeException(
-             * "TestContext must only have one TestComponent for the application of usage-based testing."
-             * ); }
-             */
             userLifeline = interaction.createLifeline(property.getName());
             userLifeline.setRepresents(property);
@@ -1094,10 +1086,5 @@
             }
 
-            // TODO String path = calledOperation.getName() + ":" + param.getName();
             String path = calledOperation.getName() + ":" + param.getType().getName();
-            // create param node
-            // Expression argument =
-            // (Expression) callMessage.createArgument(param.getName(), param.getType(),
-            // UMLPackage.Literals.EXPRESSION);
             if ((isInParameter(param) && SOAPUtils.isSOAPRequest(event)) ||
                 (isOutParameter(param) && SOAPUtils.isSOAPResponse(event)))
@@ -1116,9 +1103,4 @@
                 instSpecParameters.getClassifiers().add((DataType) param.getType());
                 instSpecNumber.setValue(instSpecNumber.intValue() + 1);
-                // InstanceValue parametersValue =
-                // (InstanceValue) argument
-                // .createOperand(param.getType().getName(), param.getType(),
-                // UMLPackage.Literals.INSTANCE_VALUE);
-                // parametersValue.setInstance(instSpecParameters);
                 InstanceValue instanceValue =
                     (InstanceValue) message.createArgument(param.getName(), param.getType(),
@@ -1131,7 +1113,4 @@
                             SOAPUtils.getMatchingChildNode(internalParameter.getType().getName(),
                                                            requestBody);
-                        // TODO the mistake is somewhere around here ... probably
-                        // List<org.w3c.dom.Element> paramNodes =
-                        // SOAPUtils.getMatchingChildNode(param.getName(), requestBody);
                         int multiplicityChosen = paramNodes.size();
 
@@ -1235,6 +1214,4 @@
                 int multiplicityChosen = 0;
                 if (currentNode != null) {
-                    // TODO attributeNodes = SOAPUtils.getMatchingChildNode(prop.getName(),
-                    // currentNode);
                     attributeNodes = SOAPUtils.getMatchingChildNode(prop.getName(), currentNode);
                     multiplicityChosen = attributeNodes.size();
@@ -1275,5 +1252,5 @@
                 Console.traceln(Level.SEVERE, "property neither DataType nor PrimitiveType: " +
                     prop.getType());
-                // TODO abort?
+                throw new RuntimeException("can only handle DataType and PrimitiveType properties but was: " + prop.getType().getClass().getName());
             }
         }
@@ -1329,4 +1306,7 @@
      *            used for warnings and debug information
      */
+    
+    @SuppressWarnings("unused")
+    @Deprecated
     private static void createOperandPrimitiveType(Parameter param,
                                                    Expression argument,
@@ -1489,28 +1469,5 @@
                 Console.traceln(Level.SEVERE, "could not create literal for primitive type: " +
                     prop.getType().getName());
-                // TODO abort?
-            }
-        }
-    }
-
-    /**
-     * <p>
-     * Sets values for the parameters of a reply message. The values are, all LiterealNull and to
-     * the INOUT, OUT and REPLY parameters, the UTP stereotype LiteralAny is applied.
-     * </p>
-     * 
-     * @param replyMessage
-     *            reply message for which the parameters are set
-     * @param calledOperation
-     *            operation that is replied for by the message
-     */
-    private static void setReplyMessageParameters(Message replyMessage, Operation calledOperation) {
-        for (Parameter param : calledOperation.getOwnedParameters()) {
-            LiteralNull argument =
-                (LiteralNull) replyMessage.createArgument(param.getName(), param.getType(),
-                                                          UMLPackage.Literals.LITERAL_NULL);
-
-            if (isOutParameter(param)) {
-                argument.applyStereotype(UTPUtils.getLiteralAnyStereotype(replyMessage.getModel()));
+                throw new RuntimeException("unknown primitive type: " + prop.getType().getName());
             }
         }
@@ -1577,5 +1534,4 @@
      */
     private static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map) {
-        // TODO possibly move to another class
         List<Map.Entry<K, V>> list = new LinkedList<>(map.entrySet());
         Collections.sort(list, new Comparator<Map.Entry<K, V>>() {