diff --git a/src/dbms/inmemory/replication_handlers.cpp b/src/dbms/inmemory/replication_handlers.cpp
index 9f58c03c0..3fc174d3c 100644
--- a/src/dbms/inmemory/replication_handlers.cpp
+++ b/src/dbms/inmemory/replication_handlers.cpp
@@ -304,7 +304,6 @@ void InMemoryReplicationHandlers::SnapshotHandler(dbms::DbmsHandler *dbms_handle
   }
   storage_guard.unlock();
 
-  // TODO AF: Do we update last_commit_timestamp here
   storage::replication::SnapshotRes res{true, storage->repl_storage_state_.last_commit_timestamp_.load()};
   slk::Save(res, res_builder);
 
diff --git a/src/replication_handler/system_replication.cpp b/src/replication_handler/system_replication.cpp
index 6e6c133a3..e98593f20 100644
--- a/src/replication_handler/system_replication.cpp
+++ b/src/replication_handler/system_replication.cpp
@@ -91,7 +91,6 @@ void SystemRecoveryHandler(memgraph::system::ReplicaHandlerAccessToState &system
   /*
    * SUCCESSFUL RECOVERY
    */
-  // TODO AF: what to do with LastCommittedTS
   system_state_access.SetLastCommitedTS(req.forced_group_timestamp);
   spdlog::debug("SystemRecoveryHandler: SUCCESS updated LCTS to {}", req.forced_group_timestamp);
   res = SystemRecoveryRes(SystemRecoveryRes::Result::SUCCESS);
diff --git a/src/storage/v2/replication/replication_storage_state.cpp b/src/storage/v2/replication/replication_storage_state.cpp
index 546e39f81..25cf484c9 100644
--- a/src/storage/v2/replication/replication_storage_state.cpp
+++ b/src/storage/v2/replication/replication_storage_state.cpp
@@ -110,7 +110,6 @@ void ReplicationStorageState::TrackLatestHistory() {
 }
 
 void ReplicationStorageState::AddEpochToHistoryForce(std::string prev_epoch) {
-  spdlog::trace("ADDING EPOCH TO HISTORY ID FORCEFULLY: {}, timestamp {}", prev_epoch, last_commit_timestamp_);
   history.emplace_back(std::move(prev_epoch), last_commit_timestamp_);
 }