diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java
index 6b5fe364a2a..d13df9288a5 100644
--- a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java
+++ b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java
@@ -282,9 +282,6 @@ public class SnapshotServiceImpl implements SnapshotService {
         try {
             SnapshotResult res = future.get();
             if (res.isFailed()) {
-                // TODO add cleanup actions in this case
-                // TODO think of whether a runtime exception is really what we want]
-
                 throw new CloudRuntimeException(res.getResult());
             }
             SnapshotInfo destSnapshot = res.getSnapshot();
diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
index ba66d1ebb81..6a9dd74eaf7 100644
--- a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
+++ b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
@@ -1995,7 +1995,6 @@ public class VolumeServiceImpl implements VolumeService {
             snapshot = snapshotMgr.takeSnapshot(volume);
         } catch (CloudRuntimeException cre) {
             s_logger.error("Take snapshot: " + volume.getId() + " failed", cre);
-            // TODO deal with cleaning the mess
             throw cre;
         } catch (Exception e) {
             if(s_logger.isDebugEnabled()) {