diff --git a/app/src/main/java/com/nextcloud/talk/api/NcApi.java b/app/src/main/java/com/nextcloud/talk/api/NcApi.java
index 902e2dacd..cbf91d05b 100644
--- a/app/src/main/java/com/nextcloud/talk/api/NcApi.java
+++ b/app/src/main/java/com/nextcloud/talk/api/NcApi.java
@@ -284,7 +284,6 @@ public interface NcApi {
                                                @FieldMap Map<String, String> fields);
 
 
-    //@Headers("Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0")
     @GET
     Observable<MentionOverall> getMentionAutocompleteSuggestions(@Header("Authorization") String authorization,
                                                                            @Url String url, @Query("search") String query,
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
index f9772b9ac..0c5948c8a 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
@@ -122,7 +122,6 @@ public class ChatController extends BaseController implements MessagesListAdapte
     TODO:
         - format mentions
         - copy message
-        - autocomplete nicks
         - check push notifications
         - new conversation handling
      */