diff --git a/lib/repositories/xmpp.dart b/lib/repositories/xmpp.dart
index 3e0480bf..ec676261 100644
--- a/lib/repositories/xmpp.dart
+++ b/lib/repositories/xmpp.dart
@@ -335,7 +335,7 @@ class XmppRepository {
                 );
               } else {
                 modelRosterItem = await db.addRosterItemFromData(
-                  "", // TODO
+                  "",
                   item.jid,
                   item.jid.split("@")[0]
                 );
@@ -352,10 +352,6 @@ class XmppRepository {
 
       // ignore: avoid_print
       print("Roster push version: " + (event.ver ?? "(null)"));
-      if (event.ver != null) {
-        // TODO: Remove
-        saveLastRosterVersion(event.ver!);
-      }
     } else if (event is RosterItemNotFoundEvent) {
       if (event.trigger == RosterItemNotFoundTrigger.remove) {
         sendData({
diff --git a/lib/xmpp/roster.dart b/lib/xmpp/roster.dart
index 62ea6962..0e76c1df 100644
--- a/lib/xmpp/roster.dart
+++ b/lib/xmpp/roster.dart
@@ -40,7 +40,6 @@ class RosterItemNotFoundEvent extends XmppEvent {
   RosterItemNotFoundEvent({ required this.jid, required this.trigger });
 }
 
-// TODO: Add override-able functions commitRoster and commitRosterVersion
 class RosterManager extends XmppManagerBase {
   String? _rosterVersion;