diff --git a/model_server/base/accessors.py b/model_server/base/accessors.py
index 95a0422f64e28a8e3818e41d1f306b2b0f196bd0..4175ef9c09c9f78d4382750c000c0e264da5fe12 100644
--- a/model_server/base/accessors.py
+++ b/model_server/base/accessors.py
@@ -43,7 +43,6 @@ class GenericImageDataAccessor(ABC):
     def is_3d(self):
         return True if self.shape_dict['Z'] > 1 else False
 
-    # TODO: no direct calls to self._data outside load/unload methods
     def is_mask(self):
         return is_mask(self.data)
 
@@ -405,7 +404,7 @@ def generate_file_accessor(fpath, **kwargs):
     else:
         raise FileAccessorError(f'Could not match a file accessor with {fpath}')
 
-# TODO: implement lazy loading at patch stack level
+
 class PatchStack(InMemoryDataAccessor):
 
     axes = 'PYXCZ'