diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
index 68f632a1..d8b2927c 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
@@ -111,7 +111,6 @@ public class NotesListViewActivity extends LockedActivity implements ItemAdapter
 
     protected ItemAdapter adapter = null;
 
-    // CS304 Issue link: https://github.com/stefan-niedermann/nextcloud-notes/issues/603
     private Menu currentMenu;
 
     protected NotesDatabase db = null;
@@ -609,7 +608,6 @@ public class NotesListViewActivity extends LockedActivity implements ItemAdapter
         new LoadNotesListTask(localAccount.getId(), getApplicationContext(), callback, navigationSelection, query).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
         new LoadCategoryListTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
 
-        // CS304 Issue link: https://github.com/stefan-niedermann/nextcloud-notes/issues/603
         updateSortMethodIcon();
     }
 
@@ -617,7 +615,6 @@ public class NotesListViewActivity extends LockedActivity implements ItemAdapter
      * Updates sorting method icon.
      */
     private void updateSortMethodIcon() {
-        // CS304 Issue link: https://github.com/stefan-niedermann/nextcloud-notes/issues/603
         if (localAccount == null || currentMenu == null) {
             return;
         }
@@ -637,7 +634,6 @@ public class NotesListViewActivity extends LockedActivity implements ItemAdapter
      */
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        // CS304 Issue link: https://github.com/stefan-niedermann/nextcloud-notes/issues/603
         final String unexpectedSortMethod = "Unexpected sort method";
         CategorySortingMethod method;
 
@@ -665,7 +661,6 @@ public class NotesListViewActivity extends LockedActivity implements ItemAdapter
      */
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
-        // CS304 Issue link: https://github.com/stefan-niedermann/nextcloud-notes/issues/603
         currentMenu = menu;
         updateSortMethodIcon();
         return super.onPrepareOptionsMenu(menu);
@@ -936,7 +931,6 @@ public class NotesListViewActivity extends LockedActivity implements ItemAdapter
 
         mActionMode.finish();
         searchView.setIconified(true);
-        // CS304 Issue link: https://github.com/stefan-niedermann/nextcloud-notes/issues/603
         refreshLists();
     }
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/LoadNotesListTask.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/LoadNotesListTask.java
index 7f4995b6..82f842f5 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/LoadNotesListTask.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/LoadNotesListTask.java
@@ -52,7 +52,6 @@ public class LoadNotesListTask extends AsyncTask<Void, Void, List<Item>> {
     protected List<Item> doInBackground(Void... voids) {
         List<DBNote> noteList;
         NotesDatabase db = NotesDatabase.getInstance(context);
-        // CS304 Issue link: https://github.com/stefan-niedermann/nextcloud-notes/issues/603
         noteList = db.searchNotes(accountId, searchQuery, category.category, category.favorite, db.getCategoryOrder(accountId, category));
 
         if (category.category == null) {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java
index 073afa5b..5b0226da 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java
@@ -1082,7 +1082,6 @@ public class NotesDatabase extends AbstractNotesDatabase {
      * @return The sorting method in CategorySortingMethod enum format
      */
     public CategorySortingMethod getCategoryOrder(long accountId, Category category) {
-        // CS304 Issue link: https://github.com/stefan-niedermann/nextcloud-notes/issues/603
         validateAccountId(accountId);
 
         final Context ctx = getContext().getApplicationContext();
@@ -1126,7 +1125,6 @@ public class NotesDatabase extends AbstractNotesDatabase {
      */
     public void modifyCategoryOrder(
             long accountId, Category category, CategorySortingMethod sortingMethod) {
-        // CS304 Issue link: https://github.com/stefan-niedermann/nextcloud-notes/issues/603
         validateAccountId(accountId);
 
         final Context ctx = getContext().getApplicationContext();
diff --git a/app/src/main/res/menu/menu_list_view.xml b/app/src/main/res/menu/menu_list_view.xml
index 76240627..6da62936 100644
--- a/app/src/main/res/menu/menu_list_view.xml
+++ b/app/src/main/res/menu/menu_list_view.xml
@@ -3,7 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:context="com.example.owncloudnotes.NotesListViewActivity">
-    <!-- CS304 Issue link: https://github.com/stefan-niedermann/nextcloud-notes/issues/603 -->
     <item
         android:id="@+id/sorting_method"
         android:title="@string/action_sorting_method"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b70fd720..2593f4e5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -9,7 +9,6 @@
     <string name="action_settings">Settings</string>
     <string name="action_trashbin">Deleted notes</string>
     <string name="action_search">Search</string>
-    <!-- CS304 Issue link: https://github.com/stefan-niedermann/nextcloud-notes/issues/603 -->
     <string name="action_sorting_method">Sorting method</string>
     <string name="simple_cancel">Cancel</string>
     <string name="simple_edit">Edit</string>