diff --git a/app/src/processing/app/contrib/ContributionListing.java b/app/src/processing/app/contrib/ContributionListing.java
index cf35ff628..d24b71a5b 100644
--- a/app/src/processing/app/contrib/ContributionListing.java
+++ b/app/src/processing/app/contrib/ContributionListing.java
@@ -51,6 +51,8 @@ public class ContributionListing {
   List<AvailableContribution> advertisedContributions;
   Map<String, List<Contribution>> librariesByCategory;
   Map<String, Contribution> librariesByImportHeader;
+  // TODO: Every contribution is getting added twice
+  // and nothing is replaced ever.
   List<Contribution> allContributions;
   boolean listDownloaded;
   boolean listDownloadFailed;
diff --git a/app/src/processing/app/contrib/ListPanel.java b/app/src/processing/app/contrib/ListPanel.java
index 5d41c9698..e0b60650d 100644
--- a/app/src/processing/app/contrib/ListPanel.java
+++ b/app/src/processing/app/contrib/ListPanel.java
@@ -526,6 +526,7 @@ implements Scrollable, ContributionListing.ChangeListener {
           }
         }
       }
+      // TODO: Make the following loop work for optimization
 //      for (Contribution contribution : filteredContributions) {
 //        if (contribution.getType() == contributionTab.contribType) {
 //          if(panelByContribution.keySet().contains(contribution)){