diff --git a/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java b/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
index aeb8449..53ff1e7 100644
--- a/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
+++ b/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
@@ -73,8 +73,6 @@
                     Candidates allCandidates = new Candidates(state, module);
 
                     // Try to populate optional fragments.
-// TODO: SINGLETON RESOLVER - These optional modules will not be considered
-//       for singleton calculation -- fix this.
                     for (Module fragment : fragments)
                     {
                         try
@@ -213,8 +211,6 @@
                 try
                 {
                     // Try to populate optional fragments.
-// TODO: SINGLETON RESOLVER - These optional modules will not be considered
-//       for singleton calculation -- fix this.
                     for (Module fragment : fragments)
                     {
                         try