diff --git a/src/lib/python/isc/config/ccsession.py b/src/lib/python/isc/config/ccsession.py
index 276a4e1ae0..a95316d6bd 100644
--- a/src/lib/python/isc/config/ccsession.py
+++ b/src/lib/python/isc/config/ccsession.py
@@ -594,7 +594,6 @@ class UIModuleCCSession(MultiConfigData):
             item_name = None
             item_value = None
             if value_str is not None:
-                #item_name =  isc.cc.data.parse_value_str(value_str)
                 item_name = value_str
             if set_value_str is not None:
                 item_value = isc.cc.data.parse_value_str(set_value_str)
@@ -669,7 +668,7 @@ class UIModuleCCSession(MultiConfigData):
            (type_any and type(cur_value) == dict):
             self._remove_value_from_named_set(identifier, value_str)
         else:
-            raise isc.cc.data.DataNotFoundError(str(identifier) + " is not a list or a named_set " + str(module_spec) + " and type " + str(type(cur_value)))
+            raise isc.cc.data.DataNotFoundError(str(identifier) + " is not a list or a named_set")
 
 
 
diff --git a/src/lib/python/isc/config/config_data.py b/src/lib/python/isc/config/config_data.py
index 2bc6edbee3..413d052b0b 100644
--- a/src/lib/python/isc/config/config_data.py
+++ b/src/lib/python/isc/config/config_data.py
@@ -657,8 +657,7 @@ class MultiConfigData:
                                                 all)
             else:
                 value, status = self.get_value(identifier)
-                if status == self.NONE and not spec_part['item_optional']:# and\
-                   #not ('item_default' in spec_part):
+                if status == self.NONE and not spec_part['item_optional']:
                     raise isc.cc.data.DataNotFoundError(identifier + " not found")
 
                 entry = _create_value_map_entry(identifier,