diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs
index d69b7104f6..c073963754 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs
+++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs
@@ -351,8 +351,6 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
 
         // populate the idkmap by indexing the content cache
         // assuming that the content cache cannot be corrupted
-        // PROBLEM: still, the idk map on-demand will do a DB lookup, is it bad?
-        // OR should we register PROVIDERS for the map FFS what a mess
         private void EnsureIdkMap(UmbracoContext umbracoContext)
         {
             lock (_idkMapLocker)
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
index 978ca6b454..3bc0ecb7cd 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
+++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
@@ -74,7 +74,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
 
         public virtual IPublishedContent GetById(UmbracoContext umbracoContext, bool preview, Guid nodeKey)
         {
-            // fixme optimize with Lucene and stuff?
+            // TODO optimize with Examine?
             var mapAttempt = ApplicationContext.Current.Services.IdkMap.GetIdForKey(nodeKey, UmbracoObjectTypes.Media);
             return mapAttempt ? GetById(umbracoContext, preview, mapAttempt.Result) : null;
         }