diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/sources/local/AppConfigStorage.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/sources/local/AppConfigStorage.kt
index 498b6ed9a828a6b80de9eb4dec50dea601741ae7..2a3677d7e1b6f03726e2b4c27cf02b01d4bf540e 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/sources/local/AppConfigStorage.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/sources/local/AppConfigStorage.kt
@@ -81,10 +81,8 @@ class AppConfigStorage @Inject constructor(
             Timber.v("Overwriting %d from %s", configFile.length(), configFile.lastModified())
         }
 
-        if (legacyConfigFile.exists()) {
-            if (legacyConfigFile.delete()) {
-                Timber.i("Legacy config file deleted, superseeded.")
-            }
+        if (legacyConfigFile.exists() && legacyConfigFile.delete()) {
+            Timber.i("Legacy config file deleted, superseeded.")
         }
 
         if (value == null) {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/lists/modular/ModularAdapter.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/lists/modular/ModularAdapter.kt
index 347550c7e149b7092922dac45b536812c253cf8e..fc2cd58944538a72c5447a0694a7b0ee74c5654b 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/lists/modular/ModularAdapter.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/lists/modular/ModularAdapter.kt
@@ -70,8 +70,13 @@ abstract class ModularAdapter<VH : ModularAdapter.VH> : BaseAdapter<VH>() {
         }
 
         interface Binder<T : VH> : Module {
-            fun onBindModularVH(adapter: ModularAdapter<T>, vh: T, pos: Int, payloads: MutableList<Any>) {}
-            fun onPostBind(adapter: ModularAdapter<T>, vh: T, pos: Int) {}
+            fun onBindModularVH(adapter: ModularAdapter<T>, vh: T, pos: Int, payloads: MutableList<Any>) {
+                // NOOP
+            }
+
+            fun onPostBind(adapter: ModularAdapter<T>, vh: T, pos: Int) {
+                // NOOP
+            }
         }
 
         interface Typing : Module {