diff --git a/League/Controllers/Match.cs b/League/Controllers/Match.cs
index 7685ffb..403a7e8 100644
--- a/League/Controllers/Match.cs
+++ b/League/Controllers/Match.cs
@@ -546,9 +546,6 @@ public async Task<IActionResult> EditFixture([FromForm] EditFixtureViewModel mod
 
         ModelState.Clear();
 
-        // Todo: This business logic should rather go into settings
-        //_tenantContext.TournamentContext.FixtureRuleSet.PlannedMatchTimeMustStayInCurrentLegBoundaries = model.Tournament.IsPlanningMode;
-
         if (!await model.ValidateAsync(
                 new FixtureValidator(match, (_tenantContext, _timeZoneConverter, model.PlannedMatch), DateTime.UtcNow),
                 ModelState))
@@ -772,8 +769,6 @@ private void SendFixtureNotification(long matchId)
 
     private void SendResultNotification(in MatchEntity match, bool isResultRemoved)
     {
-        // Todo: Should we check whether an existing result was changed?
-
         var smt = _sendMailTask.CreateNewInstance();
         smt.SetMessageCreator(new ResultEnteredCreator
         {
diff --git a/TournamentManager/TournamentManager/Data/RankingRepository.cs b/TournamentManager/TournamentManager/Data/RankingRepository.cs
index 8f973e9..e05e9d9 100644
--- a/TournamentManager/TournamentManager/Data/RankingRepository.cs
+++ b/TournamentManager/TournamentManager/Data/RankingRepository.cs
@@ -36,7 +36,6 @@ public virtual async Task ReplaceAsync(RankingList rankingList, long roundId, Ca
 
         try
         {
-            // Todo: TournamentId is defined via the Round - remove TournamentId from the Ranking table. View RankingList does not depend on TournamentId already.
             var tournamentId = await GetTournamentIdOfRoundAsync(roundId, cancellationToken);
 
             // Fetch existing ranking entities for the round for deletion