diff --git a/app/build.gradle b/app/build.gradle
index cf6a6add513..6f560e89794 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -188,7 +188,7 @@ dependencies {
   kaptAndroidTest(
       'com.google.dagger:dagger-compiler:2.24'
   )
-  // TODO (#59): Remove this once Bazel is introduced
+  // TODO(#59): Remove this once Bazel is introduced
   api project(':data')
   implementation project(":model")
   testImplementation project(":model")
diff --git a/app/src/main/java/org/oppia/android/app/drawer/ExitProfileDialogFragment.kt b/app/src/main/java/org/oppia/android/app/drawer/ExitProfileDialogFragment.kt
index 00d167178f3..eabce32cd94 100644
--- a/app/src/main/java/org/oppia/android/app/drawer/ExitProfileDialogFragment.kt
+++ b/app/src/main/java/org/oppia/android/app/drawer/ExitProfileDialogFragment.kt
@@ -63,7 +63,7 @@ class ExitProfileDialogFragment : DialogFragment() {
         dialog.dismiss()
       }
       .setPositiveButton(R.string.home_activity_back_dialog_exit) { _, _ ->
-        // TODO(#322): Need to start intent for ProfileChooserActivity to get update. Change to finish when live data bug is fixed.
+        // TODO(#3641): Investigate on using finish instead of intent.
         val intent = ProfileChooserActivity.createProfileChooserActivity(activity!!)
         if (!restoreLastCheckedItem) {
           intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
diff --git a/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragmentPresenter.kt
index cdad9e8473b..0ca42200155 100644
--- a/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragmentPresenter.kt
@@ -98,7 +98,7 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
 
   // TODO(#3382): Remove debug only code from prod build (also check imports, constructor and drawer_fragment.xml)
   private fun setIfDeveloperOptionsMenuItemListener() {
-    // TODO(3383): Find a way to make this work below N
+    // TODO(#3383): Find a way to make this work below N
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
       developerOptionsStarter.ifPresent { starter ->
         getFooterViewModel().isDebugMode.set(true)
diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/OngoingListAdapter.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/OngoingListAdapter.kt
index 39d435cea95..d6bb8f8c758 100644
--- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/OngoingListAdapter.kt
+++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/OngoingListAdapter.kt
@@ -27,7 +27,7 @@ class OngoingListAdapter(
 
   override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
     return when (viewType) {
-      // TODO(#216): Generalize this binding to make adding future items easier.
+      // TODO(#632): Generalize this binding to make adding future items easier.
       VIEW_TYPE_SECTION_TITLE_TEXT -> {
         val inflater = LayoutInflater.from(parent.context)
         val binding =
diff --git a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/SelectionInteractionViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/SelectionInteractionViewModel.kt
index 7c59bd0c252..9a26bac0524 100644
--- a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/SelectionInteractionViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/SelectionInteractionViewModel.kt
@@ -127,7 +127,7 @@ class SelectionInteractionViewModel(
         }
         return false
       } else if (selectedItems.size < maxAllowableSelectionCount) {
-        // TODO(#32): Add warning to user when they exceed the number of allowable selections or are under the minimum
+        // TODO(#3624): Add warning to user when they exceed the number of allowable selections or are under the minimum
         //  number required.
         selectedItems += itemIndex
         val wasSelectedItemListEmpty = isAnswerAvailable.get()
diff --git a/app/src/main/java/org/oppia/android/app/profile/AddProfileActivity.kt b/app/src/main/java/org/oppia/android/app/profile/AddProfileActivity.kt
index 9162d205aff..4e959e53ea1 100644
--- a/app/src/main/java/org/oppia/android/app/profile/AddProfileActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/profile/AddProfileActivity.kt
@@ -28,7 +28,7 @@ class AddProfileActivity : InjectableAppCompatActivity() {
   }
 
   override fun onSupportNavigateUp(): Boolean {
-    // TODO(#322): Need to start intent for ProfileChooserActivity to get update. Change to finish when live data bug is fixed.
+    // TODO(#3641): Investigate on using finish instead of intent.
     val intent = Intent(this, ProfileChooserActivity::class.java)
     intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
     startActivity(intent)
diff --git a/app/src/sharedTest/java/org/oppia/android/app/help/HelpActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/help/HelpActivityTest.kt
index 8924015ad05..f4edd15bde7 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/help/HelpActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/help/HelpActivityTest.kt
@@ -26,6 +26,7 @@ import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule
 import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule
 import org.oppia.android.app.shim.ViewBindingShimModule
 import org.oppia.android.app.topic.PracticeTabModule
+import org.oppia.android.data.backends.gae.NetworkModule
 import org.oppia.android.domain.classify.InteractionsModule
 import org.oppia.android.domain.classify.rules.continueinteraction.ContinueModule
 import org.oppia.android.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule
@@ -107,12 +108,12 @@ class HelpActivityTest {
   }
 
   // TODO(#59): Figure out a way to reuse modules instead of needing to re-declare them.
-  // TODO(#1675): Add NetworkModule once data module is migrated off of Moshi.
   @Singleton
   @Component(
     modules = [
       RobolectricModule::class,
       PlatformParameterModule::class,
+      NetworkModule::class,
       TestDispatcherModule::class, ApplicationModule::class,
       LoggerModule::class, ContinueModule::class, FractionInputModule::class,
       ItemSelectionInputModule::class, MultipleChoiceInputModule::class,
diff --git a/app/src/sharedTest/java/org/oppia/android/app/options/ReadingTextSizeFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/options/ReadingTextSizeFragmentTest.kt
index 01c813f38aa..2c954d90f28 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/options/ReadingTextSizeFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/options/ReadingTextSizeFragmentTest.kt
@@ -81,7 +81,7 @@ import org.robolectric.annotation.LooperMode
 import javax.inject.Inject
 import javax.inject.Singleton
 
-// TODO #1815: Remove these duplicate values once Screenshot tests are implemented.
+// TODO(#1815): Remove these duplicate values once Screenshot tests are implemented.
 private const val SMALL_TEXT_SIZE_SCALE = 0.8f
 private const val MEDIUM_TEXT_SIZE_SCALE = 1.0f
 private const val LARGE_TEXT_SIZE_SCALE = 1.2f
diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityProdTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityProdTest.kt
index bb1c39c2847..ddc45a9fb3f 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityProdTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityProdTest.kt
@@ -353,7 +353,7 @@ class NavigationDrawerActivityProdTest {
     }
   }
 
-  // TODO(#1806): Enable this once lowfi implementation is done.
+  // TODO(#552): Enable this once lowfi implementation is done.
   // TODO(#2535): Unable to open NavigationDrawer multiple times on Robolectric
   @RunOn(TestPlatform.ESPRESSO)
   @Test
@@ -465,7 +465,7 @@ class NavigationDrawerActivityProdTest {
     }
   }
 
-  // TODO(#1806): Enable this once lowfi implementation is done.
+  // TODO(#552): Enable this once lowfi implementation is done.
   // TODO(#2535): Unable to open NavigationDrawer multiple times on Robolectric
   @RunOn(TestPlatform.ESPRESSO)
   @Test
@@ -547,7 +547,7 @@ class NavigationDrawerActivityProdTest {
     }
   }
 
-  // TODO(#1806): Enable this once lowfi implementation is done.
+  // TODO(#552): Enable this once lowfi implementation is done.
   // TODO(#2535): Unable to open NavigationDrawer multiple times on Robolectric
   @RunOn(TestPlatform.ESPRESSO)
   @Test
@@ -631,7 +631,7 @@ class NavigationDrawerActivityProdTest {
     }
   }
 
-  // TODO(#1806): Enable this once lowfi implementation is done.
+  // TODO(#552): Enable this once lowfi implementation is done.
   // TODO(#2535): Unable to open NavigationDrawer multiple times on Robolectric
   @RunOn(TestPlatform.ESPRESSO)
   @Test
@@ -753,7 +753,7 @@ class NavigationDrawerActivityProdTest {
     }
   }
 
-  // TODO(#1806): Enable this once lowfi implementation is done.
+  // TODO(#552): Enable this once lowfi implementation is done.
   @Test
   @Ignore("My Downloads is removed until we have full download support.")
   fun testNavDrawer_myDownloadsMenu_myDownloadsFragmentIsDisplayed() {
diff --git a/data/build.gradle b/data/build.gradle
index 6c49cd528fe..33aea201ef4 100644
--- a/data/build.gradle
+++ b/data/build.gradle
@@ -89,8 +89,8 @@ dependencies {
       'org.robolectric:robolectric:4.4',
       project(":testing"),
   )
-  // TODO (#59): Remove this once Bazel is introduced
-  // TODO (#97): Isolate retrofit-mock dependency from production
+  // TODO(#59): Remove this once Bazel is introduced
+  // TODO(#97): Isolate retrofit-mock dependency from production
   api(
       'com.squareup.retrofit2:converter-moshi:2.5.0',
       'com.squareup.retrofit2:retrofit:2.5.0',
diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/NetworkSettings.kt b/data/src/main/java/org/oppia/android/data/backends/gae/NetworkSettings.kt
index 716b3c8ee2f..8ad661ad237 100755
--- a/data/src/main/java/org/oppia/android/data/backends/gae/NetworkSettings.kt
+++ b/data/src/main/java/org/oppia/android/data/backends/gae/NetworkSettings.kt
@@ -6,7 +6,7 @@ object NetworkSettings {
   private var isDeveloperMode: Boolean = true
 
   /** DEVELOPER URL which connects to development server */
-  // TODO(#74): Move this to DI graph
+  // TODO(#3623): Move this to DI graph
   private const val DEVELOPER_URL = "https://oppia.org"
   /**  PRODUCTION URL which connects to production server */
   private const val PROD_URL = "https://oppia.org"
diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeFeedbackReport.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeFeedbackReport.kt
index 979e628e41d..db0f8bd2cac 100644
--- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeFeedbackReport.kt
+++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeFeedbackReport.kt
@@ -4,7 +4,7 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 /** Data class for the feedback report sent by the Android app to remote storage. */
-// TODO(#2801): Link backend domain model
+// TODO(#3016): Link backend domain model
 @JsonClass(generateAdapter = true)
 data class GaeFeedbackReport(
 
diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeFeedbackReportingAppContext.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeFeedbackReportingAppContext.kt
index ae56df02e23..156496315a9 100644
--- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeFeedbackReportingAppContext.kt
+++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeFeedbackReportingAppContext.kt
@@ -4,7 +4,7 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 /** Data class for feedback reporting app info represented in the backend domain model. */
-// TODO(#2801): Link backend domain model
+// TODO(#3016): Link backend domain model
 @JsonClass(generateAdapter = true)
 data class GaeFeedbackReportingAppContext(
 
diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeFeedbackReportingDeviceContext.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeFeedbackReportingDeviceContext.kt
index eff55dec07a..8c22d3abbdf 100644
--- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeFeedbackReportingDeviceContext.kt
+++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeFeedbackReportingDeviceContext.kt
@@ -4,7 +4,7 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 /** Data class for feedback reporting device build model. */
-// TODO(#2801): Link backend domain model
+// TODO(#3016): Link backend domain model
 @JsonClass(generateAdapter = true)
 data class GaeFeedbackReportingDeviceContext(
 
diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeFeedbackReportingEntryPoint.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeFeedbackReportingEntryPoint.kt
index 4454f7a965d..4292ed84517 100644
--- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeFeedbackReportingEntryPoint.kt
+++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeFeedbackReportingEntryPoint.kt
@@ -4,7 +4,7 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 /** Data class for the feedback reporting entry point represented in the backend storage model. */
-// TODO(#2801): Link backend domain model
+// TODO(#3016): Link backend domain model
 @JsonClass(generateAdapter = true)
 data class GaeFeedbackReportingEntryPoint(
 
diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeFeedbackReportingSystemContext.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeFeedbackReportingSystemContext.kt
index 0d072697324..9c987d05506 100644
--- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeFeedbackReportingSystemContext.kt
+++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeFeedbackReportingSystemContext.kt
@@ -4,7 +4,7 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 /** Data class for feedback reporting device information model. */
-// TODO(#2801): Link backend domain model
+// TODO(#3016): Link backend domain model
 @JsonClass(generateAdapter = true)
 data class GaeFeedbackReportingSystemContext(
 
diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeUserSuppliedFeedback.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeUserSuppliedFeedback.kt
index 7f08098c27a..d70fb9abc65 100644
--- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeUserSuppliedFeedback.kt
+++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeUserSuppliedFeedback.kt
@@ -4,7 +4,7 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 /** Data class for feedback reporting form model. */
-// TODO(#2801): Link backend domain model
+// TODO(#3016): Link backend domain model
 @JsonClass(generateAdapter = true)
 data class GaeUserSuppliedFeedback(
 
diff --git a/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgressController.kt b/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgressController.kt
index 88cc2259a75..a57b2d75f1d 100644
--- a/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgressController.kt
+++ b/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgressController.kt
@@ -51,8 +51,7 @@ class ExplorationProgressController @Inject constructor(
   private val oppiaLogger: OppiaLogger
 ) {
   // TODO(#179): Add support for parameters.
-  // TODO(#182): Add support for refresher explorations.
-  // TODO(#90): Update the internal locking of this controller to use something like an in-memory
+  // TODO(#3622): Update the internal locking of this controller to use something like an in-memory
   //  blocking cache to simplify state locking. However, doing this correctly requires a fix in
   //  MediatorLiveData to avoid unexpected cancellations in chained cross-scope coroutines. Note
   //  that this is also essential to ensure post-load operations can be queued before load completes
diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/LogStorageModule.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/LogStorageModule.kt
index 558b4f84ce0..5be94dfbba6 100644
--- a/domain/src/main/java/org/oppia/android/domain/oppialogger/LogStorageModule.kt
+++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/LogStorageModule.kt
@@ -23,8 +23,11 @@ class LogStorageModule {
   @EventLogStorageCacheSize
   fun provideEventLogStorageCacheSize(): Int = 5000
 
-  /** Provides the number of records that can be stored in ExceptionLog's cache storage.*/
-  // TODO (#1104): Add correct number of records and size calculations for exceptions.
+  /**
+   * Provides the number of records that can be stored in ExceptionLog's cache storage.
+   * The current [ExceptionLogStorageCacheSize] is set to be 25 records.
+   * Taking 130 bytes per record, it is expected to occupy around 3250 bytes of disk space.
+   */
   @Provides
   @ExceptionLogStorageCacheSize
   fun provideExceptionLogStorageCacheSize(): Int = 25
diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsController.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsController.kt
index 3d38bc8417e..1aa98e7f7d7 100644
--- a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsController.kt
+++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsController.kt
@@ -116,7 +116,7 @@ class AnalyticsController @Inject constructor(
             .addEventLog(eventLog)
             .build()
         } else {
-          // TODO (#1433): Refactoring for logging exceptions to both console and exception loggers.
+          // TODO(#1433): Refactoring for logging exceptions to both console and exception loggers.
           val exception =
             NullPointerException("Least Recent Event index absent -- EventLogCacheStoreSize is 0")
           consoleLogger.e("Analytics Controller", exception.toString())
diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/exceptions/ExceptionsController.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/exceptions/ExceptionsController.kt
index 1c7773ad7cf..cba24f899d8 100644
--- a/domain/src/main/java/org/oppia/android/domain/oppialogger/exceptions/ExceptionsController.kt
+++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/exceptions/ExceptionsController.kt
@@ -131,7 +131,7 @@ class ExceptionsController @Inject constructor(
             .addExceptionLog(exceptionLog)
             .build()
         } else {
-          // TODO (#1433): Refactoring for logging exceptions to both console and exception loggers.
+          // TODO(#1433): Refactoring for logging exceptions to both console and exception loggers.
           val exception =
             NullPointerException(
               "Least Recent Exception index absent -- ExceptionLogCacheStoreSize is 0"
diff --git a/domain/src/main/java/org/oppia/android/domain/topic/StoryProgressController.kt b/domain/src/main/java/org/oppia/android/domain/topic/StoryProgressController.kt
index 7b26df8c5d9..e43bbde6971 100644
--- a/domain/src/main/java/org/oppia/android/domain/topic/StoryProgressController.kt
+++ b/domain/src/main/java/org/oppia/android/domain/topic/StoryProgressController.kt
@@ -55,9 +55,6 @@ class StoryProgressController @Inject constructor(
   private val dataProviders: DataProviders,
   private val oppiaLogger: OppiaLogger
 ) {
-  // TODO(#21): Determine whether chapters can have missing prerequisites in the initial prototype,
-  //  or if that just indicates that they can't be started due to previous chapter not yet being
-  //  completed.
 
   /** These Statuses correspond to the exceptions above such that if the deferred contains. */
   private enum class StoryProgressActionStatus {
diff --git a/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt b/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt
index 9c8b9250e48..e86bf70b964 100755
--- a/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt
+++ b/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt
@@ -341,7 +341,6 @@ class TopicController @Inject constructor(
     }
   }
 
-  // TODO(#21): Expose this as a data provider, or omit if it's not needed.
   internal fun retrieveTopic(topicId: String): Topic {
     return if (loadLessonProtosFromAssets) {
       val topicRecord =
@@ -474,7 +473,7 @@ class TopicController @Inject constructor(
 
   private fun computeTopicSizeBytes(constituentFiles: List<String>): Int {
     // TODO(#169): Compute this based on protos & the combined topic package.
-    // TODO(#386): Incorporate image files in this computation.
+    // TODO(#169): Incorporate image files in this computation.
     return constituentFiles.map { file ->
       if (loadLessonProtosFromAssets) {
         assetRepository.getLocalAssetProtoSize(file)
diff --git a/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressControllerTest.kt
index f6ce58dccb4..05bb4dbb3f8 100644
--- a/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressControllerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressControllerTest.kt
@@ -103,7 +103,7 @@ private const val INVALID_EXPLORATION_ID = "invalid_exp_id"
 @LooperMode(LooperMode.Mode.PAUSED)
 @Config(application = ExplorationProgressControllerTest.TestApplication::class)
 class ExplorationProgressControllerTest {
-  // TODO(#114): Add much more thorough tests for the integration pathway.
+  // TODO(#3646): Add much more thorough tests for the integration pathway.
 
   // TODO(#59): Once AsyncDataSubscriptionManager can be replaced with a fake, add the following
   //  tests once careful testing timing can be controlled:
diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsControllerTest.kt
index 85a20ba5535..ce783de0b9f 100644
--- a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsControllerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsControllerTest.kt
@@ -358,7 +358,7 @@ class AnalyticsControllerTest {
       .isEqualTo(ACTIVITYCONTEXT_NOT_SET)
   }
 
-  // TODO(#1106): Addition of tests tracking behaviour of the controller after uploading of logs to the remote service.
+  // TODO(#3621): Addition of tests tracking behaviour of the controller after uploading of logs to the remote service.
 
   @Test
   fun testController_logTransitionEvent_withNoNetwork_checkLogsEventToStore() {
diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/exceptions/ExceptionsControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/oppialogger/exceptions/ExceptionsControllerTest.kt
index b8d4500fa22..fad274a50cc 100644
--- a/domain/src/test/java/org/oppia/android/domain/oppialogger/exceptions/ExceptionsControllerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/exceptions/ExceptionsControllerTest.kt
@@ -106,7 +106,7 @@ class ExceptionsControllerTest {
     assertThat(exceptionLogged).isEqualTo(exceptionThrown)
   }
 
-  // TODO(#1106): Addition of tests tracking behaviour of the controller after uploading of logs to the remote service.
+  // TODO(#3621): Addition of tests tracking behaviour of the controller after uploading of logs to the remote service.
 
   @Test
   fun testController_logException_nonFatal_withNoNetwork_logsToCacheStore() {
diff --git a/domain/src/test/java/org/oppia/android/domain/question/QuestionAssessmentProgressControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/question/QuestionAssessmentProgressControllerTest.kt
index a0f9fae5e22..3954d5f4299 100644
--- a/domain/src/test/java/org/oppia/android/domain/question/QuestionAssessmentProgressControllerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/question/QuestionAssessmentProgressControllerTest.kt
@@ -133,8 +133,6 @@ class QuestionAssessmentProgressControllerTest {
   @Captor
   lateinit var asyncAnswerOutcomeCaptor: ArgumentCaptor<AsyncResult<AnsweredQuestionOutcome>>
 
-  // TODO(#2738): Add tests for score and mastery calculations
-
   @Test
   fun testGetCurrentQuestion_noSessionStarted_returnsPendingResult() {
     setUpTestApplicationWithSeed(questionSeed = 0)
diff --git a/domain/src/test/java/org/oppia/android/domain/topic/TopicListControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/topic/TopicListControllerTest.kt
index 616cf565683..1780d9bde84 100644
--- a/domain/src/test/java/org/oppia/android/domain/topic/TopicListControllerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/topic/TopicListControllerTest.kt
@@ -109,10 +109,6 @@ class TopicListControllerTest {
     ApplicationProvider.getApplicationContext<TestApplication>().inject(this)
   }
 
-  // TODO(#15): Add tests for recommended lessons rather than promoted, and tests for the 'continue playing' LiveData
-  //  not providing any data for cases when there are no ongoing lessons. Also, add tests for other uncovered cases
-  //  (such as having and not having lessons in either of the PromotedActivityList section, or AsyncResult errors).
-
   @Test
   fun testRetrieveTopicList_isSuccessful() {
     val topicListLiveData = topicListController.getTopicList().toLiveData()
diff --git a/scripts/pre-push.sh b/scripts/pre-push.sh
index d6c05bc0a8f..13d37eeb20e 100755
--- a/scripts/pre-push.sh
+++ b/scripts/pre-push.sh
@@ -13,5 +13,5 @@ else
   exit 1
 fi
 
-# TODO(#1736): Add Bazel Linter to the project
+# TODO(#3000): Add Bazel Linter to the project
 # TODO(#970): Add XML Linter to the project
diff --git a/testing/build.gradle b/testing/build.gradle
index 44051cec11b..ef2b75ced3a 100644
--- a/testing/build.gradle
+++ b/testing/build.gradle
@@ -89,7 +89,7 @@ dependencies {
   annotationProcessor(
       'com.google.auto.service:auto-service:1.0-rc4',
   )
-  // TODO (#59): Remove this once Bazel is introduced
+  // TODO(#59): Remove this once Bazel is introduced
   // sufficiently visible for generated Dagger code. This can be done more cleanly via Bazel since dependencies can be
   // controlled more directly than in Gradle.
   implementation project(':model')
diff --git a/utility/build.gradle b/utility/build.gradle
index 4b34b99ae8f..57a62088322 100644
--- a/utility/build.gradle
+++ b/utility/build.gradle
@@ -95,7 +95,7 @@ dependencies {
   kaptTest(
       'com.google.dagger:dagger-compiler:2.24'
   )
-  // TODO (#59): Remove this once Bazel is introduced
+  // TODO(#59): Remove this once Bazel is introduced
   // sufficiently visible for generated Dagger code. This can be done more cleanly via Bazel since dependencies can be
   // controlled more directly than in Gradle.
   implementation project(':model')
diff --git a/utility/src/main/java/org/oppia/android/util/data/AsyncDataSubscriptionManager.kt b/utility/src/main/java/org/oppia/android/util/data/AsyncDataSubscriptionManager.kt
index 32cbf3873f1..e71271d1081 100644
--- a/utility/src/main/java/org/oppia/android/util/data/AsyncDataSubscriptionManager.kt
+++ b/utility/src/main/java/org/oppia/android/util/data/AsyncDataSubscriptionManager.kt
@@ -43,10 +43,10 @@ class AsyncDataSubscriptionManager @Inject constructor(
    * observers of the child ID.
    */
   fun associateIds(childId: Any, parentId: Any) {
-    // TODO(#6): Ensure this graph is acyclic to avoid infinite recursion during notification. Compile-time deps should
+    // TODO(#3625): Ensure this graph is acyclic to avoid infinite recursion during notification. Compile-time deps should
     //  make this impossible in practice unless data provider users try to use the same key for multiple inter-dependent
     //  data providers.
-    // TODO(#6): Find a way to determine parent-child ID associations during subscription time to avoid needing to store
+    // TODO(#3625): Find a way to determine parent-child ID associations during subscription time to avoid needing to store
     //  long-lived references to IDs prior to subscriptions.
     associatedIds.enqueue(parentId, childId)
   }
diff --git a/utility/src/main/java/org/oppia/android/util/data/DataProvider.kt b/utility/src/main/java/org/oppia/android/util/data/DataProvider.kt
index 1bf6339d8fc..5b940afa095 100644
--- a/utility/src/main/java/org/oppia/android/util/data/DataProvider.kt
+++ b/utility/src/main/java/org/oppia/android/util/data/DataProvider.kt
@@ -8,8 +8,6 @@ import android.content.Context
  * @param <T> The type of data being provided.
  */
 abstract class DataProvider<T>(val context: Context) {
-  // TODO(#6): Finalize the interfaces for this API beyond a basic prototype for the initial project
-  //  intro.
 
   /**
    * Returns a unique identifier that corresponds to this data provider. This should be a trivially