diff --git a/crashreport_stats/management/commands/stats.py b/crashreport_stats/management/commands/stats.py
index 35133c5..d510a0e 100644
--- a/crashreport_stats/management/commands/stats.py
+++ b/crashreport_stats/management/commands/stats.py
@@ -254,10 +254,8 @@
 
         """
         return (
-            query_objects.annotate(_report_day=TruncDate("date")).values(
-                self.version_field_name, "_report_day"
-            )
-            # FIXME Agressively drop duplicates
+            query_objects.annotate(_report_day=TruncDate("date"))
+            .values(self.version_field_name, "_report_day")
             .annotate(count=Count("date", distinct=True))
         )
 
diff --git a/crashreport_stats/tests.py b/crashreport_stats/tests.py
index 31cbe6b..0fd9fc9 100644
--- a/crashreport_stats/tests.py
+++ b/crashreport_stats/tests.py
@@ -558,13 +558,6 @@
 class StatsCommandVersionsTestCase(TestCase):
     """Test the generation of Version stats with the stats command."""
 
-    # FIXME: Test for false duplicates: same timestamps but different UUIDs
-    # FIXME: Test that the 'released_on' field changes or not once an older
-    #   report has been sent depending on whether the field has been manually
-    #   changed
-    # FIXME: Test that tests the daily version stats
-    # FIXME: Test creating stats from reports of different devices/users.
-
     # The class of the version type to be tested
     version_class = Version
     # The attribute name characterising the unicity of a stats entry (the
diff --git a/crashreports/models.py b/crashreports/models.py
index ccdbc5b..7e33865 100644
--- a/crashreports/models.py
+++ b/crashreports/models.py
@@ -126,7 +126,6 @@
     uuid = property(_get_uuid)
 
 
-# TODO remove logfile_type or make it meaningful
 class LogFile(models.Model):
     """A log file that was sent along with a crashreport."""
 
diff --git a/crashreports/rest_api_heartbeats.py b/crashreports/rest_api_heartbeats.py
index e2e266e..adc15e4 100644
--- a/crashreports/rest_api_heartbeats.py
+++ b/crashreports/rest_api_heartbeats.py
@@ -12,9 +12,6 @@
 from crashreports.response_descriptions import default_desc
 from crashreports.serializers import HeartBeatSerializer
 
-# TODO: There is quite some code duplciation between here and the corresponding
-#       crashreport code. We should revisit this later.
-
 
 @method_decorator(
     name="get",