diff --git a/extensions/lifecycle/tasks/LifecycleDeleteObjectTask.js b/extensions/lifecycle/tasks/LifecycleDeleteObjectTask.js
index bcd35ec23..711bd328f 100644
--- a/extensions/lifecycle/tasks/LifecycleDeleteObjectTask.js
+++ b/extensions/lifecycle/tasks/LifecycleDeleteObjectTask.js
@@ -50,7 +50,7 @@ class LifecycleDeleteObjectTask extends BackbeatTask {
                 // <!> Only in S3C <!> Backbeat API returns 'InvalidBucketState' error if the bucket is not versioned.
                 // In this case, instead of logging an error, it should be logged as a debug message,
                 // to avoid causing unnecessary concern to the customer.
-                // TODO: After the implementation of CLDSRV-461, we could remove this check.
+                // TODO: BB-612
                 const logLevel = err.code === 'InvalidBucketState' ? 'debug' : 'error';
                 log[logLevel]('error getting metadata blob from S3', Object.assign({
                     method: 'LifecycleDeleteObjectTask._getMetadata',
diff --git a/lib/BackbeatMetadataProxy.js b/lib/BackbeatMetadataProxy.js
index 806af73dd..c6bb90fea 100644
--- a/lib/BackbeatMetadataProxy.js
+++ b/lib/BackbeatMetadataProxy.js
@@ -207,7 +207,7 @@ class BackbeatMetadataProxy extends BackbeatTask {
                 // <!> Only in S3C <!> Backbeat API returns 'InvalidBucketState' error if the bucket is not versioned.
                 // In this case, instead of logging an error, it should be logged as a debug message,
                 // to avoid causing unnecessary concern to the customer.
-                // TODO: After the implementation of CLDSRV-461, we could remove this check.
+                // TODO: BB-612
                 if (err.ObjNotFound || err.code === 'ObjNotFound' || err.code === 'InvalidBucketState') {
                     return cbOnce(err);
                 }