diff --git a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestRiskLevelCalculation.kt b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestRiskLevelCalculation.kt
index a81b12c96b8c5bf9ca62c27ae76cf61f3785fc4c..83b7d857dc2b8fe76b8dc134f007ed2448f4f3fe 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestRiskLevelCalculation.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/TestRiskLevelCalculation.kt
@@ -344,7 +344,6 @@ class TestRiskLevelCalculation : Fragment() {
         }
     }
 
-    // todo remove before release - not used in prod setup - only for testing
     suspend fun asyncGetExposureInformation(token: String): List<ExposureInformation> =
         suspendCoroutine { cont ->
             exposureNotificationClient.getExposureInformation(token)
diff --git a/Corona-Warn-App/src/deviceForTesters/res/menu/menu_main.xml b/Corona-Warn-App/src/deviceForTesters/res/menu/menu_main.xml
index 95688307e6eae470f5ad3407f3b58edb64373769..680f4bd138172b7caab32caba8e1d768f73f43a1 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/menu/menu_main.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/menu/menu_main.xml
@@ -8,7 +8,8 @@
     <item
         android:id="@+id/menu_settings"
         android:title="@string/menu_settings" />
-    <!-- Todo throwaway code only for testing -->
+
+    <!-- These are for testing  -->
     <item
         android:id="@+id/menu_test_api"
         android:title="@string/menu_test_api" />
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/applicationconfiguration/ApplicationConfigurationService.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/applicationconfiguration/ApplicationConfigurationService.kt
index 07c6b91af73856451948ef350194aa89208cc9f6..c8f8d61882679af31a63cceca26e7a23334916b9 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/applicationconfiguration/ApplicationConfigurationService.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/applicationconfiguration/ApplicationConfigurationService.kt
@@ -13,7 +13,6 @@ object ApplicationConfigurationService {
         asyncRetrieveApplicationConfiguration()
             .mapRiskScoreToExposureConfiguration()
 
-    // todo double check that the weighted params are not used
     private fun ApplicationConfiguration.mapRiskScoreToExposureConfiguration(): ExposureConfiguration =
         ExposureConfiguration
             .ExposureConfigurationBuilder()
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/LocalData.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/LocalData.kt
index 6be3628848ace7942f65bfd7a9de2d23b32e9b6a..802451cdb4bdd8b994e07a8774a101838a871478 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/LocalData.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/LocalData.kt
@@ -89,9 +89,7 @@ object LocalData {
             0L
         )
 
-        // TODO need this for nullable ref, shout not be goto for nullable storage
         if (timestamp == 0L) return null
-
         return timestamp
     }
 
@@ -121,9 +119,7 @@ object LocalData {
                 .getString(R.string.preference_last_non_active_tracing_timestamp),
             0L
         )
-        // TODO need this for nullable ref, shout not be goto for nullable storage
         if (timestamp == 0L) return null
-
         return timestamp
     }
 
@@ -134,7 +130,6 @@ object LocalData {
      * @param value timestamp in ms
      */
     fun lastNonActiveTracingTimestamp(value: Long?) = getSharedPreferenceInstance().edit(true) {
-        // TODO need this for nullable ref, shout not be goto for nullable storage
         putLong(
             CoronaWarnApplication.getAppContext().getString(
                 R.string.preference_last_non_active_tracing_timestamp
@@ -150,7 +145,6 @@ object LocalData {
      * @param value timestamp in ms
      */
     fun totalNonActiveTracing(value: Long?) {
-        // TODO need this for nullable ref, shout not be goto for nullable storage
         getSharedPreferenceInstance().edit(true) {
             putLong(
                 CoronaWarnApplication.getAppContext()
@@ -323,7 +317,6 @@ object LocalData {
                 .getString(R.string.preference_timestamp_diagnosis_keys_fetch),
             0L
         )
-        // TODO need this for nullable ref, shout not be goto for nullable storage
         if (time == 0L) return null
 
         return Date(time)
@@ -535,9 +528,7 @@ object LocalData {
             0L
         )
 
-        // TODO need this for nullable ref, shout not be goto for nullable storage
         if (timestamp == 0L) return null
-
         return timestamp
     }
 
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/TracingRepository.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/TracingRepository.kt
index c018540071a67b3cdae95a30ccf3f7aae6de0881..8617cabc2426738890686886971cb1f07e7127e2 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/TracingRepository.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/TracingRepository.kt
@@ -67,7 +67,6 @@ object TracingRepository {
      *
      * @see InternalExposureNotificationClient
      */
-    // TODO [EN] Define EN error handling
     suspend fun refreshIsTracingEnabled() {
         try {
             val isEnabled = InternalExposureNotificationClient.asyncIsEnabled()