diff --git a/dimensiondata/src/main/java/org/jclouds/examples/dimensiondata/cloudcontrol/NetworkDomainTearDown.java b/dimensiondata/src/main/java/org/jclouds/examples/dimensiondata/cloudcontrol/NetworkDomainTearDown.java
index 8048f4c3..2526fb9d 100644
--- a/dimensiondata/src/main/java/org/jclouds/examples/dimensiondata/cloudcontrol/NetworkDomainTearDown.java
+++ b/dimensiondata/src/main/java/org/jclouds/examples/dimensiondata/cloudcontrol/NetworkDomainTearDown.java
@@ -172,8 +172,14 @@ private static void deleteServers(DimensionDataCloudControlApi api, Injector inj
             {
                 if (server.state() == State.FAILED_ADD)
                 {
-                    logger.info("Server with Id %s is not in a FAILED_ADD state, manually run Clean Server operation.", server.id());
-                    continue;
+                    logger.info("Server with Id %s is in a FAILED_ADD state, running the clean server operation.", server.id());
+                    api.getServerApi().cleanServer(server.id());
+                    waitForServerDeleted(injector, server);
+                    if (api.getServerApi().getServer(server.id()) != null)
+                    {
+                        logger.info("Failed to clean Server with Id %s", server.id());
+                        continue;
+                    }
                 }
                 if (server.state() != State.NORMAL)
                 {