diff --git a/devito/mpi/distributed.py b/devito/mpi/distributed.py
index 1001155466..4325055247 100644
--- a/devito/mpi/distributed.py
+++ b/devito/mpi/distributed.py
@@ -289,7 +289,6 @@ def all_ranges(self):
         ret = []
         for i in self.all_numb:
             # In cases where ranks are empty, return a range(0, 0)
-            # FIXME: Not sure I like this, seems hacky
             ret.append(EnrichedTuple(*[range(min(j), max(j) + 1) if len(j) > 0
                                        else range(0, 0) for j in i],
                                      getters=self.dimensions))
diff --git a/devito/mpi/halo_scheme.py b/devito/mpi/halo_scheme.py
index 9b13f0aefe..c96a09f380 100644
--- a/devito/mpi/halo_scheme.py
+++ b/devito/mpi/halo_scheme.py
@@ -12,7 +12,6 @@
 from devito.symbolics.manipulation import _uxreplace_registry
 from devito.tools import (Reconstructable, Tag, as_tuple, filter_ordered, flatten,
                           frozendict, is_integer, filter_sorted, EnrichedTuple)
-from devito.types import Grid
 
 __all__ = ['HaloScheme', 'HaloSchemeEntry', 'HaloSchemeException', 'HaloTouch']