diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/GetTokenResponseExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/GetTokenResponseExtensions.kt
index a9c3ebbf2a..9f5197d615 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/GetTokenResponseExtensions.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/GetTokenResponseExtensions.kt
@@ -23,7 +23,6 @@ fun GetTokenResponseJson.Success.toUserState(
     val jwtTokenData = parseJwtTokenDataOrNull(jwtToken = accessToken)!!
     val userId = jwtTokenData.userId
 
-    // TODO: Update null properties below via sync request (BIT-916)
     val account = AccountJson(
         profile = AccountJson.Profile(
             userId = userId,
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensions.kt
index 8ad7ae3eea..3a049bed31 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensions.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensions.kt
@@ -23,7 +23,6 @@ fun UserStateJson.toUpdatedUserStateJson(
     val userId = syncProfile.id
     val account = this.accounts[userId] ?: return this
     val profile = account.profile
-    // TODO: Update additional missing UserStateJson properties (BIT-916)
     val updatedProfile = profile
         .copy(
             avatarColorHex = syncProfile.avatarColor,
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/createaccount/CreateAccountViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/createaccount/CreateAccountViewModel.kt
index ce95666457..431e09b3a2 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/createaccount/CreateAccountViewModel.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/createaccount/CreateAccountViewModel.kt
@@ -129,7 +129,7 @@ class CreateAccountViewModel @Inject constructor(
             }
 
             PasswordStrengthResult.Error -> {
-                // TODO: Assess possible error conditions (BIT-964)
+                // Leave UI the same
             }
         }
     }
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModel.kt
index 430cd43c0b..30685c60e2 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModel.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModel.kt
@@ -122,9 +122,6 @@ class AddSendViewModel @Inject constructor(
 ) {
 
     init {
-        // TODO: Check the special circumstance to place in custom mode when a new send request is
-        //  initiated externally (BIT-1518).
-
         when (val addSendType = state.addSendType) {
             AddSendType.AddItem -> Unit
             is AddSendType.EditItem -> {
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt
index 9df2da6924..2f6ddcb4f3 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt
@@ -536,7 +536,6 @@ class VaultViewModel @Inject constructor(
     }
 
     private fun vaultPendingReceive(vaultData: DataState.Pending<VaultData>) {
-        // TODO update state to refresh state BIT-505
         mutableStateFlow.update {
             it.copy(
                 viewState = vaultData.data.toViewState(