diff --git a/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/domain/BaseImage.java b/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/domain/BaseImage.java
index 1f0d1433b..27174e7d9 100644
--- a/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/domain/BaseImage.java
+++ b/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/domain/BaseImage.java
@@ -23,11 +23,6 @@
 
 
 public abstract class BaseImage {
-   public static final String IMAGE_TYPE_METADATA_KEY = "IMAGE_TYPE";
-   public static final String OS_FAMILY_METADATA_KEY = "OS_FAMILY";
-
-   public static final String OS_FAMILY_UNIX = "UNIX";
-   public static final String OS_FAMILY_WINDOWS = "WINDOWS";
 
    public String type;
 
@@ -53,6 +48,7 @@ public abstract class BaseImage {
 
    public abstract int memoryGb();
 
+   @Nullable
    public abstract List<ImageNic> nics();
 
    public abstract List<Disk> disks();
diff --git a/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/domain/NetworkInfo.java b/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/domain/NetworkInfo.java
index faaa9c8e7..2a80142c4 100644
--- a/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/domain/NetworkInfo.java
+++ b/dimensiondata/src/main/java/org/jclouds/dimensiondata/cloudcontrol/domain/NetworkInfo.java
@@ -18,6 +18,7 @@
 
 import com.google.auto.value.AutoValue;
 import com.google.common.collect.ImmutableList;
+import org.jclouds.javax.annotation.Nullable;
 import org.jclouds.json.SerializedNames;
 
 import java.util.List;
@@ -36,6 +37,7 @@ public static Builder builder() {
 
    public abstract NIC primaryNic();
 
+   @Nullable
    public abstract List<NIC> additionalNic();
 
    @SerializedNames({ "networkDomainId", "primaryNic", "additionalNic" })
diff --git a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/parse/OsImagesParseTest.java b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/parse/OsImagesParseTest.java
index ca1736389..65af50873 100644
--- a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/parse/OsImagesParseTest.java
+++ b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/parse/OsImagesParseTest.java
@@ -22,7 +22,6 @@
 import org.jclouds.dimensiondata.cloudcontrol.domain.Cluster;
 import org.jclouds.dimensiondata.cloudcontrol.domain.Disk;
 import org.jclouds.dimensiondata.cloudcontrol.domain.Guest;
-import org.jclouds.dimensiondata.cloudcontrol.domain.ImageNic;
 import org.jclouds.dimensiondata.cloudcontrol.domain.OperatingSystem;
 import org.jclouds.dimensiondata.cloudcontrol.domain.OsImage;
 import org.jclouds.dimensiondata.cloudcontrol.domain.OsImages;
@@ -50,11 +49,10 @@ public OsImages expected() {
             .description("DRaaS CentOS Release 5.9 64-bit").guest(Guest.builder().osCustomization(false)
                   .operatingSystem(
                         OperatingSystem.builder().id("CENTOS564").displayName("CENTOS5/64").family("UNIX").build())
-                  .build()).cpu(CPU.builder().count(2).speed("STANDARD").coresPerSocket(1).build()).memoryGb(4)
-            .nics(ImmutableList.of(ImageNic.builder().networkAdapter("E1000").key(4040).build())).disks(ImmutableList
-                  .of(Disk.builder().id("98299851-37a3-4ebe-9cf1-090da9ae42a0").scsiId(0).sizeGb(20).speed("STANDARD")
-                        .build())).softwareLabels(Lists.<String>newArrayList()).osImageKey("T-CENT-5-64-2-4-10")
-            .createTime(parseDate("2016-06-09T17:36:31.000Z")).datacenterId("NA1")
+                  .build()).cpu(CPU.builder().count(2).speed("STANDARD").coresPerSocket(1).build()).memoryGb(4).disks(
+                  ImmutableList.of(Disk.builder().id("98299851-37a3-4ebe-9cf1-090da9ae42a0").scsiId(0).sizeGb(20)
+                        .speed("STANDARD").build())).softwareLabels(Lists.<String>newArrayList())
+            .osImageKey("T-CENT-5-64-2-4-10").createTime(parseDate("2016-06-09T17:36:31.000Z")).datacenterId("NA1")
             .cluster(Cluster.builder().id("NA12-01").name("my cluster name").build()).build();
       assertEquals(osImage.type, OsImage.TYPE, "OsImage type is not OS_IMAGE");
       List<OsImage> osImages = ImmutableList.of(osImage);
diff --git a/dimensiondata/src/test/resources/osImages.json b/dimensiondata/src/test/resources/osImages.json
index 49c73874c..6d974eec6 100644
--- a/dimensiondata/src/test/resources/osImages.json
+++ b/dimensiondata/src/test/resources/osImages.json
@@ -21,12 +21,7 @@
           "speed": "STANDARD"
         }
       ],
-      "nic": [
-        {
-          "networkAdapter": "E1000",
-          "key": "4040"
-        }
-      ],
+      "nic": null,
       "softwareLabel": [],
       "createTime": "2016-06-09T17:36:31.000Z",
       "id": "12ea8472-6e4e-4068-b2cb-f04ecacd3962",
diff --git a/dimensiondata/src/test/resources/servers.json b/dimensiondata/src/test/resources/servers.json
index c0de4e853..013ed163b 100644
--- a/dimensiondata/src/test/resources/servers.json
+++ b/dimensiondata/src/test/resources/servers.json
@@ -34,7 +34,7 @@
           "key": "4000",
           "state": "NORMAL"
         },
-        "additionalNic": [],
+        "additionalNic": null,
         "networkDomainId": "690de302-bb80-49c6-b401-8c02bbefb945"
       },
       "softwareLabel": [],