diff --git a/libs/wsdl4j-1.6.2.jar b/libs/wsdl4j-1.6.2.jar
deleted file mode 100644
index b9ffc36..0000000
Binary files a/libs/wsdl4j-1.6.2.jar and /dev/null differ
diff --git a/src/zutil/net/http/soap/SOAPHttpPage.java b/src/zutil/net/http/soap/SOAPHttpPage.java
index 246ee28..7174490 100644
--- a/src/zutil/net/http/soap/SOAPHttpPage.java
+++ b/src/zutil/net/http/soap/SOAPHttpPage.java
@@ -47,7 +47,7 @@ import zutil.net.ws.WSParameterDef;
 import zutil.net.ws.WSReturnObject;
 import zutil.net.ws.WSReturnObject.WSValueName;
 import zutil.net.ws.WebServiceDef;
-import zutil.parser.wsdl.WSDLWriterOld;
+import zutil.parser.wsdl.WSDLWriter;
 
 /**
  * This is an HTTPPage for the HTTPServer that 
@@ -88,7 +88,7 @@ public class SOAPHttpPage implements HttpPage{
 	/** This instance of the web service class is used if session is disabled **/
 	private WSInterface ws;
 	/** The WSDL document **/
-	private WSDLWriterOld wsdl;
+	private WSDLWriter wsdl;
 	/** Session enabled **/
 	private boolean session_enabled;
 
@@ -96,7 +96,7 @@ public class SOAPHttpPage implements HttpPage{
 		this.wsDef = wsDef;
 		this.session_enabled = false;
 
-		wsdl = new WSDLWriterOld( wsDef );
+		wsdl = new WSDLWriter( wsDef );
 	}
 	
 	/**
@@ -238,7 +238,7 @@ public class SOAPHttpPage implements HttpPage{
 	/**
 	 * Converts an String XML to an Element
 	 * 
-	 * @param 		msg 		is the string XML
+	 * @param 		xml 		is the string XML
 	 * @return 					the XML root Element
 	 */
 	private Element getXMLRoot(String xml) throws Exception {
diff --git a/src/zutil/parser/json/JSONObjectOutputStream.java b/src/zutil/parser/json/JSONObjectOutputStream.java
index 0ea273b..5c9bd6d 100644
--- a/src/zutil/parser/json/JSONObjectOutputStream.java
+++ b/src/zutil/parser/json/JSONObjectOutputStream.java
@@ -22,7 +22,6 @@
 
 package zutil.parser.json;
 
-import sun.misc.ClassLoaderUtil;
 import zutil.ClassUtil;
 import zutil.parser.DataNode;
 import zutil.parser.DataNode.DataType;
@@ -109,7 +108,7 @@ public class JSONObjectOutputStream extends OutputStream implements ObjectOutput
     }
 
     protected DataNode getDataNode(Object obj) throws IOException, IllegalArgumentException, IllegalAccessException {
-        DataNode root = null;
+        DataNode root;
 
         // Check if the object is a primitive
         if(ClassUtil.isPrimitive(obj.getClass()) ||
@@ -168,7 +167,7 @@ public class JSONObjectOutputStream extends OutputStream implements ObjectOutput
     }
 
     private DataNode getPrimitiveDataNode(Class<?> type, Object value) throws UnsupportedDataTypeException, IllegalArgumentException, IllegalAccessException {
-    	DataNode node = null;
+    	DataNode node;
         if     (type == int.class ||
         		type == Integer.class ||
         		type == long.class ||
@@ -202,4 +201,8 @@ public class JSONObjectOutputStream extends OutputStream implements ObjectOutput
         generateMetaData = generate;
     }
 
+    public void flush() throws IOException {
+        super.flush();
+        out.flush();
+    }
 }
diff --git a/src/zutil/parser/json/JSONWriter.java b/src/zutil/parser/json/JSONWriter.java
index 02a8508..3b38433 100644
--- a/src/zutil/parser/json/JSONWriter.java
+++ b/src/zutil/parser/json/JSONWriter.java
@@ -33,97 +33,91 @@ import zutil.parser.DataNode.DataType;
 
 /**
  * Writes An JSONNode to an String or stream
- * 
+ *
  * @author Ziver
  */
 public class JSONWriter{
-	private PrintWriter out;
-	
-	/**
-	 * Creates a new instance of the writer
-	 * 
-	 * @param out the OutputStream that the Nodes will be sent to
-	 */
-	public JSONWriter(OutputStream out){
-		this( new PrintWriter(out) );
-	}
-	
-	/**
-	 * Creates a new instance of the writer
-	 * 
-	 * @param out the OutputStream that the Nodes will be sent to
-	 */
-	public JSONWriter(PrintStream out){
-		this( new PrintWriter(out) );
-	}
-	
-	/**
-	 * Creates a new instance of the writer
-	 * 
-	 * @param out the OutputStream that the Nodes will be sent to
-	 */
-	public JSONWriter(PrintWriter out){
-		this.out = out;
-	}
-	
-	/**
-	 * Writes the specified node to the stream
-	 * 
-	 * @param root is the root node
-	 */
-	public void write(DataNode root){
-		boolean first = true;
-		switch(root.getType()){
-		// Write Map
-		case Map:
-			out.print('{');
-			Iterator<String> it = root.keyIterator();
-			while(it.hasNext()){
-				if(!first)
-					out.print(", ");
-				String key = it.next();
-				try{
-					out.print( Integer.parseInt(key) );
-				}catch(Exception e){
-					out.print('\"');
-					out.print(key);
-					out.print('\"');
-				}				
-				out.print(": ");
-				write( root.get(key) );
-				first = false;
-			}
-			out.print('}');
-			break;
-		// Write an list
-		case List:
-			out.print('[');
-			for(DataNode node : root){
-				if(!first)
-					out.print(", ");
-				write( node );
-				first = false;
-			}
-			out.print(']');
-			break;		
-		default:
-			if(root.getString() != null && root.getType() == DataType.String){
-				out.print('\"');
-				out.print(root.toString());
-				out.print('\"');
-			} else
-				out.print(root.toString());
-			break;
-		}
-		out.flush();
-	}
-	
-	/**
-	 * Closes the internal stream
-	 */
-	public void close(){
-		out.close();
-	}
+    private PrintWriter out;
+
+    /**
+     * Creates a new instance of the writer
+     *
+     * @param out the OutputStream that the Nodes will be sent to
+     */
+    public JSONWriter(OutputStream out){
+        this( new PrintWriter(out) );
+    }
+
+    /**
+     * Creates a new instance of the writer
+     *
+     * @param out the OutputStream that the Nodes will be sent to
+     */
+    public JSONWriter(PrintStream out){
+        this( new PrintWriter(out) );
+    }
+
+    /**
+     * Creates a new instance of the writer
+     *
+     * @param out the OutputStream that the Nodes will be sent to
+     */
+    public JSONWriter(PrintWriter out){
+        this.out = out;
+    }
+
+    /**
+     * Writes the specified node to the stream
+     *
+     * @param root is the root node
+     */
+    public void write(DataNode root){
+        boolean first = true;
+        switch(root.getType()){
+            // Write Map
+            case Map:
+                out.append('{');
+                Iterator<String> it = root.keyIterator();
+                while(it.hasNext()){
+                    if(!first)
+                        out.append(", ");
+                    String key = it.next();
+                    out.append('\"');
+                    out.append(key);
+                    out.append("\": ");
+                    write(root.get(key));
+                    first = false;
+                }
+                out.append('}');
+                break;
+            // Write List
+            case List:
+                out.append('[');
+                for(DataNode node : root){
+                    if(!first)
+                        out.append(", ");
+                    write(node);
+                    first = false;
+                }
+                out.append(']');
+                break;
+            default:
+                if(root.getString() != null && root.getType() == DataType.String){
+                    out.append('\"');
+                    out.append(root.toString());
+                    out.append('\"');
+                } else
+                    out.append(root.toString());
+                break;
+        }
+    }
+
+    /**
+     * Closes the internal stream
+     */
+    public void close(){
+        out.close();
+    }
 
     /**
      * @return JSON String that is generated from the input DataNode graph
@@ -135,4 +129,8 @@ public class JSONWriter{
         writer.close();
         return out.toString();
     }
+
+    public void flush(){
+        out.flush();
+    }
 }
diff --git a/src/zutil/parser/wsdl/WSDLWriterOld.java b/src/zutil/parser/wsdl/WSDLWriterOld.java
deleted file mode 100644
index b2b1dad..0000000
--- a/src/zutil/parser/wsdl/WSDLWriterOld.java
+++ /dev/null
@@ -1,455 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Ziver
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- ******************************************************************************/
-
-package zutil.parser.wsdl;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Import;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPOperation;
-import javax.wsdl.factory.WSDLFactory;
-import javax.xml.namespace.QName;
-
-import org.dom4j.Document;
-import org.dom4j.DocumentHelper;
-import org.dom4j.Element;
-
-import com.ibm.wsdl.extensions.PopulatedExtensionRegistry;
-import com.ibm.wsdl.extensions.soap.SOAPConstants;
-import com.sun.org.apache.xerces.internal.dom.DocumentImpl;
-
-import zutil.io.StringOutputStream;
-import zutil.net.ws.WSMethodDef;
-import zutil.net.ws.WSParameterDef;
-import zutil.net.ws.WSReturnObject;
-import zutil.net.ws.WSReturnObject.WSValueName;
-import zutil.net.ws.WebServiceDef;
-
-public class WSDLWriterOld{
-	
-	private WebServiceDef ws;
-	private String cache;
-	private String soapURL;
-	
-	public WSDLWriterOld( WebServiceDef ws ){
-		this.ws = ws;
-		try {
-			Definition  wsdl = generateWSDL( );
-			
-			StringOutputStream out = new StringOutputStream();
-			
-			javax.wsdl.xml.WSDLWriter writer = WSDLFactory.newInstance().newWSDLWriter();
-			writer.writeWSDL(wsdl, out);
-			
-			//OutputFormat format = OutputFormat.createPrettyPrint();
-			//XMLWriter writer = new XMLWriter( out, format );
-			//writer.write( wsdlType );
-			
-			this.cache = out.toString();
-			out.close();			
-		} catch (WSDLException e) {
-			e.printStackTrace();
-		}
-		
-	}
-
-	/**
-	 * @param 		binding		adds this binding to the WSDL generation
-	 */
-	public void setSOAPAddress( String url ){
-		this.soapURL = url;
-	}
-	
-	
-	
-	public void write( PrintStream out ) {
-		out.print( cache );
-	}
-	
-	public void write( OutputStream out ) throws IOException {
-		out.write( cache.getBytes() );
-	}
-	
-	/**
-	 * Generates an WSDL document for the class
-	 * 
-	 * @throws WSDLException
-	 */
-	private Definition generateWSDL( ) throws WSDLException {
-		ArrayList<Class<?>> types = new ArrayList<Class<?>>();
-		
-		String tns = ws.getNamespace()+"?wsdl";
-		String xsd = "http://www.w3.org/2001/XMLSchema";
-		String soap = "http://schemas.xmlsoap.org/wsdl/soap/";
-		String wsdln = "http://schemas.xmlsoap.org/wsdl/";
-		String td = ws.getNamespace()+"?type";
-
-		PopulatedExtensionRegistry extReg = new PopulatedExtensionRegistry();
-		WSDLFactory factory = WSDLFactory.newInstance();
-		String portTypeName = ws.getName()+"PortType";
-
-		Definition wsdl = factory.newDefinition();
-		wsdl.setQName(new QName(tns, ws.getName()));
-		wsdl.setTargetNamespace(tns);
-		wsdl.addNamespace("tns", tns);
-		wsdl.addNamespace("xsd", xsd);
-		wsdl.addNamespace("soap", soap);
-		wsdl.addNamespace("wsdl", wsdln);
-		wsdl.addNamespace("td", td);
-
-		Message exception = wsdl.createMessage();
-		exception.setQName(new QName(tns, "exception"));
-		exception.setUndefined(true);
-		Part epart = wsdl.createPart();
-		epart.setName("message");
-		epart.setTypeName(new QName(xsd, "string"));
-		exception.addPart(epart);
-		wsdl.addMessage(exception);
-		
-		Message empty = wsdl.createMessage();
-		empty.setQName(new QName(tns, "empty"));
-		empty.setUndefined(false);
-		epart = wsdl.createPart();
-		epart.setName("empty");
-		epart.setTypeName(new QName(td, "empty"));
-		empty.addPart(epart);
-		wsdl.addMessage(empty);	
-
-		// Types import
-		Import imp = wsdl.createImport();
-		imp.setNamespaceURI(td);
-		imp.setLocationURI(td);
-		wsdl.addImport(imp);
-		
-		// PortType
-		PortType portType = wsdl.createPortType();
-		portType.setQName(new QName(tns, portTypeName));
-		portType.setUndefined(false);
-		for( WSMethodDef method : ws.getMethods() ){
-			Operation operation = wsdl.createOperation();			
-			//********* Request Messages
-			if( method.getInputCount() > 0 ){
-				Message msgIn = wsdl.createMessage();
-				msgIn.setQName(new QName(tns, method.getName()+"Request"));
-				msgIn.setUndefined(false);
-
-				//***** Documentation
-				if(method.getDocumentation() != null){
-					org.w3c.dom.Document xmldoc= new DocumentImpl();
-					org.w3c.dom.Element paramDoc = xmldoc.createElement("wsdl:documentation");
-					paramDoc.setTextContent( method.getDocumentation() );
-					msgIn.setDocumentationElement(paramDoc);
-				}
-
-				// Parameters
-				for( WSParameterDef param : method.getInputs() ){
-					// Parts
-					Part part = wsdl.createPart();
-					part.setName( param.getName() );
-					part.setTypeName(new QName( xsd, 
-							getClassSOAPName( param.getParamClass() )));
-					if( param.isOptional() )
-						part.getExtensionAttribute(new QName("minOccurs", "0"));
-					msgIn.addPart(part);
-				}
-				wsdl.addMessage(msgIn);
-				Input input = wsdl.createInput();
-				input.setMessage(msgIn);
-				operation.setInput(input);
-			}
-			else{
-				Input input = wsdl.createInput();
-				input.setMessage(empty);
-				operation.setInput(input);
-			}
-			//********** Response Message
-			if( method.getOutputCount() > 0 ){
-				Message msgOut = wsdl.createMessage();
-				msgOut.setQName(new QName(tns, method.getName()+"Response"));
-				msgOut.setUndefined(false);
-				
-				for( WSParameterDef param : method.getOutputs() ){					
-					// Parts
-					Part part = wsdl.createPart();
-					part.setName( param.getName() );
-					msgOut.addPart(part);
-					
-					Class<?> paramClass = param.getParamClass();
-					Class<?> valueClass = getClass( paramClass );
-					// is an binary array
-					if(byte[].class.isAssignableFrom( paramClass )){
-						part.setTypeName(new QName(xsd, "base64Binary"));
-					}
-					// is an array?
-					else if( paramClass.isArray()){
-						part.setTypeName(new QName(td, 
-								"ArrayOf"+getClassSOAPName( paramClass ).replaceAll("[\\[\\]]", "")));
-						// add to type generation list
-						if(!types.contains( paramClass ))
-							types.add( paramClass );
-					}
-					else if( WSReturnObject.class.isAssignableFrom(valueClass) ){					
-						// its an SOAPObject
-						part.setTypeName(new QName(td, getClassSOAPName( paramClass )));
-						// add to type generation list
-						if(!types.contains(valueClass))
-							types.add(valueClass);
-					}
-					else{// its an Object 
-						part.setTypeName(new QName(xsd, getClassSOAPName( paramClass )));
-					}
-				}
-
-				wsdl.addMessage(msgOut);				
-				Output output = wsdl.createOutput();			
-				output.setMessage(msgOut);			
-				operation.setOutput(output);			
-			}
-			//************* Exceptions	
-			if( method.exceptionCount() > 0){
-				Fault fault = wsdl.createFault();
-				fault.setMessage(exception);
-				operation.addFault(fault);
-			}
-			//************* Operations			
-			operation.setName(method.getName());			
-			operation.setUndefined(false);			
-
-			//***** Documentation
-			if(method.getDocumentation() != null){
-				// <!-- example -->
-				org.w3c.dom.Document xmldoc= new DocumentImpl();
-				org.w3c.dom.Element doc = xmldoc.createElement("wsdl:documentation");
-				doc.setTextContent( method.getDocumentation() );
-				operation.setDocumentationElement(doc);
-			}
-
-			portType.addOperation(operation);
-		}
-		wsdl.addPortType(portType);
-
-		// Binding
-		Binding binding = wsdl.createBinding();
-		binding.setQName(new QName(tns, ws.getName()+"Binding"));
-		binding.setPortType(portType);
-		binding.setUndefined(false);
-
-		SOAPBinding soapBinding = (SOAPBinding)extReg.createExtension(Binding.class, SOAPConstants.Q_ELEM_SOAP_BINDING);
-		soapBinding.setStyle("rpc");
-		//soapBinding.setRequired(true);
-		soapBinding.setTransportURI("http://schemas.xmlsoap.org/soap/http");
-		binding.addExtensibilityElement(soapBinding);
-
-		for(WSMethodDef method : ws.getMethods()){
-			BindingOperation operation = wsdl.createBindingOperation();
-			operation.setName(method.getName());
-
-			SOAPOperation soapOperation = (SOAPOperation)extReg.createExtension(BindingOperation.class, SOAPConstants.Q_ELEM_SOAP_OPERATION);
-			soapOperation.setSoapActionURI(method.getNamespace());
-			operation.addExtensibilityElement(soapOperation);
-
-			//********************************* input
-			BindingInput input = wsdl.createBindingInput();
-			// TODO: Header
-			// Body
-			//else{
-				SOAPBody soapBody = (SOAPBody)extReg.createExtension(BindingInput.class, SOAPConstants.Q_ELEM_SOAP_BODY);
-				soapBody.setUse("literal");
-				soapBody.setNamespaceURI(method.getNamespace());
-				input.addExtensibilityElement(soapBody);
-			//}
-			operation.setBindingInput(input);
-
-			//********************************** output
-			if( method.getOutputCount() > 0 ){
-				BindingOutput output = wsdl.createBindingOutput();
-				// TODO: Header
-				// Body
-				//else{
-					SOAPBody soapBodyBind = (SOAPBody)extReg.createExtension(BindingInput.class, SOAPConstants.Q_ELEM_SOAP_BODY);
-					soapBodyBind.setUse("literal");
-					soapBodyBind.setNamespaceURI(method.getNamespace());
-					output.addExtensibilityElement(soapBodyBind);
-				//}
-				operation.setBindingOutput(output);
-			}
-
-			binding.addBindingOperation(operation);
-		}
-		wsdl.addBinding(binding);
-
-		//******************* Service
-		Port port = wsdl.createPort();
-		port.setName( ws.getName()+"Port" );
-		port.setBinding(binding);
-		SOAPAddress addr = (SOAPAddress)extReg.createExtension(Port.class, SOAPConstants.Q_ELEM_SOAP_ADDRESS);
-		addr.setLocationURI( soapURL );
-		port.addExtensibilityElement(addr);
-
-		Service ser = wsdl.createService();
-		ser.setQName(new QName(tns, ws.getName()+"Service"));
-		ser.addPort(port);
-		wsdl.addService(ser);
-
-		// generate the complexTypes
-		generateWSDLType(types);
-		return wsdl;
-	}
-
-	/**
-	 * This function generates the Type part of the WSDL.
-	 * Should be cabled after generateWSDL has finished.
-	 * 
-	 */
-	private void generateWSDLType(ArrayList<Class<?>> types){
-		Document wsdlType = DocumentHelper.createDocument();
-		Element definitions = wsdlType.addElement( "wsdl:definitions" );
-		definitions.addAttribute("targetNamespace", ws.getNamespace());
-		definitions.addNamespace("tns", ws.getNamespace()+"?type");
-		definitions.addNamespace("xsd", "http://www.w3.org/2001/XMLSchema");
-		definitions.addNamespace("wsdl", "http://schemas.xmlsoap.org/wsdl/"); 
-		definitions.addNamespace("SOAP-ENC", "http://schemas.xmlsoap.org/soap/encoding/");
-
-		Element typeE = definitions.addElement("wsdl:types");	
-		Element schema = typeE.addElement("xsd:schema");
-		schema.addAttribute("targetNamespace", ws.getNamespace()+"?type");
-		
-		// empty type
-		Element empty = schema.addElement("xsd:complexType");
-		empty.addAttribute("name", "empty");
-		empty.addElement("xsd:sequence");
-
-		for(int n=0; n<types.size() ;n++){
-			Class<?> c = types.get(n);
-			// Generate Array type
-			if(c.isArray()){
-				Class<?> ctmp = getClass(c);
-				
-				Element type = schema.addElement("xsd:complexType");
-				type.addAttribute("name", 
-						"ArrayOf"+getClassSOAPName(c).replaceAll("[\\[\\]]", ""));
-								
-				Element sequence = type.addElement("xsd:sequence");
-				
-				Element element = sequence.addElement("xsd:element");
-				element.addAttribute("minOccurs", "0");
-				element.addAttribute("maxOccurs", "unbounded");
-				element.addAttribute("name", "element");
-				element.addAttribute("nillable", "true");
-				if( WSReturnObject.class.isAssignableFrom(ctmp) )
-					element.addAttribute("type", "tns:"+getClassSOAPName(c).replace("[]", ""));
-				else
-					element.addAttribute("type", "xsd:"+getClassSOAPName(c).replace("[]", ""));
-				
-				if(!types.contains(ctmp))
-					types.add(ctmp);
-			}
-			// Generate SOAPObject type
-			else if(WSReturnObject.class.isAssignableFrom(c)){
-				Element type = schema.addElement("xsd:complexType");
-				type.addAttribute("name", getClassSOAPName(c));
-
-				Element sequence = type.addElement("xsd:sequence");
-
-				Field[] fields = c.getFields();
-				for(int i=0; i<fields.length ;i++){
-					WSValueName tmp = fields[i].getAnnotation( WSValueName.class );
-					String name;
-					if(tmp != null) name = tmp.value();
-					else name = "field"+i;
-
-					Element element = sequence.addElement("xsd:element");
-					element.addAttribute("name", name);
-
-					// Check if the object is an SOAPObject
-					Class<?> cTmp = getClass(fields[i].getType());
-					if( WSReturnObject.class.isAssignableFrom(cTmp) ){
-						element.addAttribute("type", "tns:"+getClassSOAPName(cTmp));
-						if(!types.contains(cTmp))
-							types.add(cTmp);
-					}
-					else{
-						element.addAttribute("type", "xsd:"+getClassSOAPName(fields[i].getType()));
-					}
-					// Is the Field optional
-					if(tmp != null && tmp.optional())
-						element.addAttribute("minOccurs", "0");
-				}
-			}
-		}
-	}
-	
-	
-	///////////////////////////////////////////////////////////////////////////////////////////////
-	// TODO: FIX THESE ARE DUPLICATES FROM SOAPHttpPage
-	///////////////////////////////////////////////////////////////////////////////////////////////
-	
-	private Class<?> getClass(Class<?> c){
-		if(c!=null && c.isArray()){
-			return getClass(c.getComponentType());
-		}
-		return c;
-	}
-	
-	private String getClassSOAPName(Class<?> c){
-		Class<?> cTmp = getClass(c);
-		if( byte[].class.isAssignableFrom(c) ){
-			return "base64Binary";
-		}
-		else if( WSReturnObject.class.isAssignableFrom(cTmp) ){
-			return c.getSimpleName();
-		}
-		else{
-			String ret = c.getSimpleName().toLowerCase();
-			
-			if( 	 cTmp == Integer.class ) 	ret = ret.replaceAll("integer", "int");
-			else if( cTmp == Character.class )	ret = ret.replaceAll("character", "char");
-			
-			return ret;
-		}
-	}
-	
-	public void close() {}
-
-}
diff --git a/src/zutil/test/SOAPTest.java b/src/zutil/test/SOAPTest.java
index 6c5b1d7..49054b2 100644
--- a/src/zutil/test/SOAPTest.java
+++ b/src/zutil/test/SOAPTest.java
@@ -31,14 +31,11 @@ import zutil.net.ws.WSInterface;
 import zutil.net.ws.WSInterface.*;
 import zutil.net.ws.WSReturnObject;
 import zutil.net.ws.WebServiceDef;
-import zutil.parser.wsdl.WSDLWriterOld;
 import zutil.parser.wsdl.WSDLWriter;
 
 
 public class SOAPTest {
-	//*******************************************************************************************
-	//**************************** TEST *********************************************************
-
+    /************************* TEST CASES ************************/
 	public static void main(String[] args){
 		new SOAPTest();
 	}
@@ -47,7 +44,7 @@ public class SOAPTest {
 		WebServiceDef wsDef = new WebServiceDef( MainSOAPClass.class );
 		SOAPHttpPage soap = new SOAPHttpPage( wsDef );
 		
-		WSDLWriterOld wsdl = new WSDLWriterOld( wsDef );
+		WSDLWriter wsdl = new WSDLWriter( wsDef );
 		wsdl.write(System.out);
 		System.out.println( "****************** new *********************" );	
 		WSDLWriter wsdl2 = new WSDLWriter( wsDef );
@@ -80,7 +77,9 @@ public class SOAPTest {
 			e.printStackTrace();
 		}
 	}
-	
+
+    /************************* TEST CLASSES ************************/
+    @SuppressWarnings("unused")
 	public static class SpecialReturnClass extends WSReturnObject{
 		@WSValueName(value="otherValue1")
 		public String param1 = "otherValue1";
@@ -89,18 +88,21 @@ public class SOAPTest {
 		public byte[] b = new byte[]{0x12, 0x23};
 		public InnerClass inner = new InnerClass();
 	}
-	
+
+    @SuppressWarnings("unused")
 	public static class InnerClass extends WSReturnObject{
 		public String innerClassParam1 = "innerClass1";
 		public String innerClassParam2 = "innerClass2";
 	}
 
+    @SuppressWarnings("unused")
 	public static class SimpleReturnClass extends WSReturnObject{
 		@WSValueName("otherParam1")
 		public String param1 = "param1";
 		public String param2 = "param2";
 	}
 
+    @SuppressWarnings("unused")
 	@WSNamespace("http://test.se:8080/")
 	public static class MainSOAPClass implements WSInterface{
 		public MainSOAPClass(){}
@@ -147,7 +149,7 @@ public class SOAPTest {
 		@WSDisabled()
 		public void disabledMethod(){ }
 		protected void protectedMethod(){ }	
-		@SuppressWarnings("unused")
+
 		private void privateMethod(){ }
 	}
 }