diff --git a/ironic/common/utils.py b/ironic/common/utils.py
index 6ab27247e4..f67bebfc5e 100644
--- a/ironic/common/utils.py
+++ b/ironic/common/utils.py
@@ -521,27 +521,6 @@ def mkfs(fs, path, label=None):
     execute(*args)
 
 
-# TODO(deva): Make these work in Ironic.
-#             Either copy nova/virt/utils (bad),
-#             or reimplement as a common lib,
-#             or make a driver that doesn't need to do this.
-#
-#def cache_image(context, target, image_id, user_id, project_id):
-#    if not os.path.exists(target):
-#        libvirt_utils.fetch_image(context, target, image_id,
-#                                  user_id, project_id)
-#
-#
-#def inject_into_image(image, key, net, metadata, admin_password,
-#        files, partition, use_cow=False):
-#    try:
-#        disk_api.inject_data(image, key, net, metadata, admin_password,
-#                files, partition, use_cow)
-#    except Exception as e:
-#        LOG.warn(_("Failed to inject data into image %(image)s. "
-#                   "Error: %(e)s") % locals())
-
-
 def unlink_without_raise(path):
     try:
         os.unlink(path)
diff --git a/ironic/db/sqlalchemy/api.py b/ironic/db/sqlalchemy/api.py
index 7aab684548..193ec26b3c 100644
--- a/ironic/db/sqlalchemy/api.py
+++ b/ironic/db/sqlalchemy/api.py
@@ -21,7 +21,6 @@ import datetime
 
 from oslo.config import cfg
 
-# TODO(deva): import MultipleResultsFound and handle it appropriately
 from sqlalchemy.orm.exc import NoResultFound
 
 from ironic.common import exception
diff --git a/ironic/objects/node.py b/ironic/objects/node.py
index 929b3cb1db..457bb823d1 100644
--- a/ironic/objects/node.py
+++ b/ironic/objects/node.py
@@ -27,15 +27,10 @@ class Node(base.IronicObject):
             'id': int,
 
             'uuid': utils.str_or_none,
-            # NOTE: chassis_id should be read-only after node is created
             'chassis_id': utils.int_or_none,
-            # NOTE: instance_uuid must be read-only when node is provisioned
             'instance_uuid': utils.str_or_none,
 
-            # NOTE: driver should be read-only after node is created
             'driver': utils.str_or_none,
-            # NOTE: driver_info should probably be read-only when node
-            #       is provisioned
             'driver_info': utils.dict_or_none,
 
             'properties': utils.dict_or_none,
@@ -63,7 +58,6 @@ class Node(base.IronicObject):
         :param uuid: the uuid of a node.
         :returns: a :class:`Node` object.
         """
-        # TODO(deva): enable getting ports for this node
         db_node = cls.dbapi.get_node(uuid)
         return Node._from_db_object(cls(), db_node)
 
@@ -78,10 +72,6 @@ class Node(base.IronicObject):
 
         :param context: Security context
         """
-        # TODO(deva): enforce safe limits on what fields may be changed
-        #             depending on state. Eg., do not allow changing
-        #             instance_uuid of an already-provisioned node.
-        #             Raise exception if unsafe to change something.
         updates = {}
         changes = self.obj_what_changed()
         for field in changes:
diff --git a/ironic/tests/objects/test_node.py b/ironic/tests/objects/test_node.py
index aebad6d83f..e83920ec5f 100644
--- a/ironic/tests/objects/test_node.py
+++ b/ironic/tests/objects/test_node.py
@@ -40,9 +40,6 @@ class TestNodeObject(base.DbTestCase):
 
             mock_get_node.assert_called_once_with(uuid)
 
-            # TODO(deva): add tests for load-on-demand info, eg. ports,
-            #             once Port objects are created
-
     def test_save(self):
         uuid = self.fake_node['uuid']
         with mock.patch.object(self.dbapi, 'get_node',