diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CaptureVAppParams.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CaptureVAppParams.java
index 8398a6df89..038fbbcba8 100644
--- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CaptureVAppParams.java
+++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CaptureVAppParams.java
@@ -153,24 +153,24 @@ public class CaptureVAppParams
     *  Gets the value of the section property.
     *    
     * Objects of the following type(s) are allowed in the list
-    * {@code <}{@link Section> }{@code >}
-    * {@code <}{@link VirtualHardwareSection > }{@code >}
-    * {@code <}{@link LeaseSettingsSection> }{@code >}
-    * {@code <}{@link EulaSection> }{@code >}
-    * {@code <}{@link RuntimeInfoSection> }{@code >}
-    * {@code <}{@link AnnotationSection> }{@code >}
-    * {@code <}{@link DeploymentOptionSection > }{@code >}
-    * {@code <}{@link StartupSection> }{@code >}
-    * {@code <}{@link ResourceAllocationSection> }{@code >}
-    * {@code <}{@link NetworkConnectionSection> }{@code >}
-    * {@code <}{@link CustomizationSection> }{@code >}
-    * {@code <}{@link ProductSection > }{@code >}
-    * {@code <}{@link GuestCustomizationSection> }{@code >}
-    * {@code <}{@link OperatingSystemSection > }{@code >}
-    * {@code <}{@link NetworkConfigSection> }{@code >}
-    * {@code <}{@link NetworkSection > }{@code >}
-    * {@code <}{@link DiskSection > }{@code >}
-    * {@code <}{@link InstallSection> }{@code >}
+    * {@link Section }
+    * {@link VirtualHardwareSection }
+    * {@link LeaseSettingsSection }
+    * {@link EulaSection }
+    * {@link RuntimeInfoSection }
+    * {@link AnnotationSection }
+    * {@link DeploymentOptionSection }
+    * {@link StartupSection }
+    * {@link ResourceAllocationSection }
+    * {@link NetworkConnectionSection }
+    * {@link CustomizationSection }
+    * {@link ProductSection }
+    * {@link GuestCustomizationSection }
+    * {@link OperatingSystemSection }
+    * {@link NetworkConfigSection }
+    * {@link NetworkSection }
+    * {@link DiskSection }
+    * {@link InstallSection }
     */
    public Set<? extends Section<?>> getSections() {
       return Collections.unmodifiableSet(this.sections);
diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/InstantiationParams.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/InstantiationParams.java
index 3de5de0052..4df90cd487 100644
--- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/InstantiationParams.java
+++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/InstantiationParams.java
@@ -113,24 +113,24 @@ public class InstantiationParams {
     * Gets the value of the section property.
     * <p/>
     * Objects of the following type(s) are allowed in the list
-    * {@code <}{@link SectionType }{@code >}
-    * {@code <}{@link VirtualHardwareSection }{@code >}
-    * {@code <}{@link LeaseSettingsSection }{@code >}
-    * {@code <}{@link EulaSection }{@code >}
-    * {@code <}{@link RuntimeInfoSection }{@code >}
-    * {@code <}{@link AnnotationSection }{@code >}
-    * {@code <}{@link DeploymentOptionSection }{@code >}
-    * {@code <}{@link StartupSection }{@code >}
-    * {@code <}{@link ResourceAllocationSection }{@code >}
-    * {@code <}{@link NetworkConnectionSection }{@code >}
-    * {@code <}{@link CustomizationSection }{@code >}
-    * {@code <}{@link ProductSection }{@code >}
-    * {@code <}{@link GuestCustomizationSection }{@code >}
-    * {@code <}{@link org.jclouds.ovf.OperatingSystemSection }{@code >}
-    * {@code <}{@link NetworkConfigSection }{@code >}
-    * {@code <}{@link NetworkSection }{@code >}
-    * {@code <}{@link DiskSection }{@code >}
-    * {@code <}{@link InstallSection }{@code >}
+    * {@link SectionType }
+    * {@link VirtualHardwareSection }
+    * {@link LeaseSettingsSection }
+    * {@link EulaSection }
+    * {@link RuntimeInfoSection }
+    * {@link AnnotationSection }
+    * {@link DeploymentOptionSection }
+    * {@link StartupSection }
+    * {@link ResourceAllocationSection }
+    * {@link NetworkConnectionSection }
+    * {@link CustomizationSection }
+    * {@link ProductSection }
+    * {@link GuestCustomizationSection }
+    * {@link org.jclouds.ovf.OperatingSystemSection }
+    * {@link NetworkConfigSection }
+    * {@link NetworkSection }
+    * {@link DiskSection }
+    * {@link InstallSection }
     */
    public Set<? extends SectionType<?>> getSections() {
       return Collections.unmodifiableSet(this.sections);
diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java
index faa5ad8f8a..bb7c60e489 100644
--- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java
+++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java
@@ -308,24 +308,24 @@ public class VAppTemplate extends ResourceEntityType<VAppTemplate> {
     * Gets the value of the section property.
     * <p/>
     * Objects of the following type(s) are allowed in the list
-    * {@code <}{@link SectionType }{@code >}
-    * {@code <}{@link VirtualHardwareSection }{@code >}
-    * {@code <}{@link LeaseSettingsSection }{@code >}
-    * {@code <}{@link EulaSection }{@code >}
-    * {@code <}{@link RuntimeInfoSection }{@code >}
-    * {@code <}{@link AnnotationSection }{@code >}
-    * {@code <}{@link DeploymentOptionSection }{@code >}
-    * {@code <}{@link StartupSection }{@code >}
-    * {@code <}{@link ResourceAllocationSection }{@code >}
-    * {@code <}{@link NetworkConnectionSection }{@code >}
-    * {@code <}{@link CustomizationSection }{@code >}
-    * {@code <}{@link ProductSection }{@code >}
-    * {@code <}{@link GuestCustomizationSection }{@code >}
-    * {@code <}{@link OperatingSystemSection }{@code >}
-    * {@code <}{@link NetworkConfigSection }{@code >}
-    * {@code <}{@link NetworkSection }{@code >}
-    * {@code <}{@link DiskSection }{@code >}
-    * {@code <}{@link InstallSection }{@code >}
+    * {@link SectionType }
+    * {@link VirtualHardwareSection }
+    * {@link LeaseSettingsSection }
+    * {@link EulaSection }
+    * {@link RuntimeInfoSection }
+    * {@link AnnotationSection }
+    * {@link DeploymentOptionSection }
+    * {@link StartupSection }
+    * {@link ResourceAllocationSection }
+    * {@link NetworkConnectionSection }
+    * {@link CustomizationSection }
+    * {@link ProductSection }
+    * {@link GuestCustomizationSection }
+    * {@link OperatingSystemSection }
+    * {@link NetworkConfigSection }
+    * {@link NetworkSection }
+    * {@link DiskSection }
+    * {@link InstallSection }
     */
    public Set<? extends SectionType<?>> getSections() {
       return Collections.unmodifiableSet(this.sections);
diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ovf/internal/BaseEnvelope.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ovf/internal/BaseEnvelope.java
index b76ec28dbc..6a4a0394e5 100644
--- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ovf/internal/BaseEnvelope.java
+++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ovf/internal/BaseEnvelope.java
@@ -38,9 +38,6 @@ import com.google.common.collect.Sets;
  */
 public abstract class BaseEnvelope<V extends BaseVirtualSystem<V>, E extends BaseEnvelope<V, E>> {
 
-   /**
-    * {@inheritDoc}
-    */
    public abstract Builder<V, E> toBuilder();
 
    public static abstract class Builder<V extends BaseVirtualSystem<V>, E extends BaseEnvelope<V, E>> {
@@ -109,9 +106,6 @@ public abstract class BaseEnvelope<V extends BaseVirtualSystem<V>, E extends Bas
          return this;
       }
 
-      /**
-       * {@inheritDoc}
-       */
       @SuppressWarnings("unchecked")
       public abstract E build() ;