diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.jaxws.core/META-INF/MANIFEST.MF
index 9377283..459bebc 100644
--- a/bundles/org.eclipse.jst.ws.jaxws.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws.jaxws.core/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jst.ws.jaxws.core;singleton:=true
 Bundle-Vendor: %pluginProvider
-Bundle-Version: 1.0.402.qualifier
+Bundle-Version: 1.0.403.qualifier
 Bundle-ClassPath: .
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/UniqueNamesRule.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/UniqueNamesRule.java
index d00a830..f2f67b1 100644
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/UniqueNamesRule.java
+++ b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/UniqueNamesRule.java
@@ -12,14 +12,11 @@
 
 import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.CLASS_NAME;
 import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.FAULT_BEAN;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.HEADER;
 import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.LOCAL_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.MODE;
 import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.NAME;
 import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.OPERATION_NAME;
 import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.PART_NAME;
 import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.PORT_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.RESPONSE_SUFFIX;
 import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.SERVICE_NAME;
 import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.TARGET_NAMESPACE;
 
@@ -37,12 +34,9 @@
 
 import javax.jws.WebMethod;
 import javax.jws.WebParam;
-import javax.jws.WebResult;
 import javax.jws.WebService;
-import javax.jws.WebParam.Mode;
 import javax.jws.soap.SOAPBinding;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Holder;
 import javax.xml.ws.RequestWrapper;
 import javax.xml.ws.ResponseWrapper;
 import javax.xml.ws.WebFault;
@@ -65,7 +59,6 @@
 import com.sun.mirror.declaration.ParameterDeclaration;
 import com.sun.mirror.declaration.TypeDeclaration;
 import com.sun.mirror.type.ReferenceType;
-import com.sun.mirror.type.TypeMirror;
 import com.sun.mirror.util.SourcePosition;
 
 public class UniqueNamesRule extends AbstractAnnotationProcessor {
@@ -86,7 +79,8 @@
                 validateNameAttributes(typeDeclaration);
                 checkOperationNames(typeDeclaration.getMethods());
                 checkWrapperAndFaultBeanNames(typeDeclaration.getMethods());
-                checkDocumentBareMethods(typeDeclaration.getMethods());
+                //https://bugs.eclipse.org/bugs/show_bug.cgi?id=479748
+                //checkDocumentBareMethods(typeDeclaration.getMethods());
                 checkMethodParameters(typeDeclaration.getMethods());
             }
         }
@@ -280,6 +274,9 @@
         }
     }
 
+    /* 
+    https://bugs.eclipse.org/bugs/show_bug.cgi?id=479748
+    
     private void checkDocumentBareMethods(Collection<? extends MethodDeclaration> methods) {
         List<MethodDeclaration> docBareMethods = new ArrayList<MethodDeclaration>();
         for (MethodDeclaration methodDeclaration : methods) {
@@ -296,7 +293,8 @@
 
         validateQNames(qNames, JAXWSCoreMessages.DOC_BARE_METHODS_UNIQUE_XML_ELEMENTS);
     }
-
+    */
+    
     private SourcePosition getPosition(Object value) {
         if (value instanceof AnnotationValue) {
             return ((AnnotationValue) value).getPosition();
@@ -310,6 +308,9 @@
         return null;
     }
 
+    /*
+    https://bugs.eclipse.org/bugs/show_bug.cgi?id=479748
+    
     private void getDocumentBareOperationRequest(MethodDeclaration methodDeclaration, Map<Object, QName> qNames) {
         Collection<ParameterDeclaration> parameters = methodDeclaration.getParameters();
         for (ParameterDeclaration parameterDeclaration : parameters) {
@@ -412,6 +413,7 @@
     private boolean returnsVoid(MethodDeclaration methodDeclaration) {
         return methodDeclaration.getReturnType().equals(environment.getTypeUtils().getVoidType());
     }
+    */
 
     private void checkMethodParameters(Collection<? extends MethodDeclaration> methodDeclarations) {
         List<MethodDeclaration> methods = new ArrayList<MethodDeclaration>();
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/feature.xml b/features/org.eclipse.jst.ws.jaxws.feature/feature.xml
index 910d5e1..8099cf8 100644
--- a/features/org.eclipse.jst.ws.jaxws.feature/feature.xml
+++ b/features/org.eclipse.jst.ws.jaxws.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jst.ws.jaxws.feature"
       label="%featureName"
-      version="1.2.202.qualifier"
+      version="1.2.203.qualifier"
       provider-name="%featureProvider"
       plugin="org.eclipse.jst.ws.jaxws.core"
       image="eclipse_update_120.jpg"
diff --git a/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.xml b/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.xml
index 85c6d1b..52dcd6f 100644
--- a/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.xml
+++ b/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jst.ws.jaxws_sdk.feature"
       label="%featureName"
-      version="1.2.202.qualifier"
+      version="1.2.203.qualifier"
       provider-name="%featureProvider"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.license"
