diff --git a/Examples/xx-messenger/Package.swift b/Examples/xx-messenger/Package.swift
index 5457518c69182edcba6c38d10f956f33401f32c8..f552abe40f22920d1358f3487de7207633d272af 100644
--- a/Examples/xx-messenger/Package.swift
+++ b/Examples/xx-messenger/Package.swift
@@ -344,7 +344,6 @@ let package = Package(
     .target(
       name: "WelcomeFeature",
       dependencies: [
-        .target(name: "AppCore"),
         .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
         .product(name: "XXMessengerClient", package: "elixxir-dapps-sdk-swift"),
       ],
diff --git a/Examples/xx-messenger/Sources/AppFeature/AppEnvironment+Live.swift b/Examples/xx-messenger/Sources/AppFeature/AppEnvironment+Live.swift
index c6bb208ebdbbe014fcccb62b3ecf9231a015eefd..e00d9d8231fd35509eabc64d79c22f2de715646b 100644
--- a/Examples/xx-messenger/Sources/AppFeature/AppEnvironment+Live.swift
+++ b/Examples/xx-messenger/Sources/AppFeature/AppEnvironment+Live.swift
@@ -90,7 +90,6 @@ extension AppEnvironment {
       welcome: {
         WelcomeEnvironment(
           messenger: messenger,
-          dbManager: dbManager,
           mainQueue: mainQueue,
           bgQueue: bgQueue
         )
diff --git a/Examples/xx-messenger/Sources/WelcomeFeature/WelcomeFeature.swift b/Examples/xx-messenger/Sources/WelcomeFeature/WelcomeFeature.swift
index 9e98e4be26e2a23ed85e2e2989a10fac059f91e8..5bfe814829ab4e85ff12ed43ec4b01fa91d9dc45 100644
--- a/Examples/xx-messenger/Sources/WelcomeFeature/WelcomeFeature.swift
+++ b/Examples/xx-messenger/Sources/WelcomeFeature/WelcomeFeature.swift
@@ -1,4 +1,3 @@
-import AppCore
 import ComposableArchitecture
 import SwiftUI
 import XXMessengerClient
@@ -26,18 +25,15 @@ public enum WelcomeAction: Equatable {
 public struct WelcomeEnvironment {
   public init(
     messenger: Messenger,
-    dbManager: DBManager,
     mainQueue: AnySchedulerOf<DispatchQueue>,
     bgQueue: AnySchedulerOf<DispatchQueue>
   ) {
     self.messenger = messenger
-    self.dbManager = dbManager
     self.mainQueue = mainQueue
     self.bgQueue = bgQueue
   }
 
   public var messenger: Messenger
-  public var dbManager: DBManager
   public var mainQueue: AnySchedulerOf<DispatchQueue>
   public var bgQueue: AnySchedulerOf<DispatchQueue>
 }
@@ -45,7 +41,6 @@ public struct WelcomeEnvironment {
 extension WelcomeEnvironment {
   public static let unimplemented = WelcomeEnvironment(
     messenger: .unimplemented,
-    dbManager: .unimplemented,
     mainQueue: .unimplemented,
     bgQueue: .unimplemented
   )
@@ -59,7 +54,6 @@ public let welcomeReducer = Reducer<WelcomeState, WelcomeAction, WelcomeEnvironm
     state.failure = nil
     return .future { fulfill in
       do {
-        try env.dbManager.removeDB()
         try env.messenger.create()
         fulfill(.success(.finished))
       }
diff --git a/Examples/xx-messenger/Tests/WelcomeFeatureTests/WelcomeFeatureTests.swift b/Examples/xx-messenger/Tests/WelcomeFeatureTests/WelcomeFeatureTests.swift
index 160e8e13bb3d8694b10e2ee16fb6dee1f9371ff4..c6f23b7a6c885a0b8728796f6e3fd41f3a018aa1 100644
--- a/Examples/xx-messenger/Tests/WelcomeFeatureTests/WelcomeFeatureTests.swift
+++ b/Examples/xx-messenger/Tests/WelcomeFeatureTests/WelcomeFeatureTests.swift
@@ -5,25 +5,20 @@ import XCTest
 @MainActor
 final class WelcomeFeatureTests: XCTestCase {
   func testNewAccountTapped() {
+    let mainQueue = DispatchQueue.test
+    let bgQueue = DispatchQueue.test
+
+    var didCreateMessenger = 0
+
     let store = TestStore(
       initialState: WelcomeState(),
       reducer: welcomeReducer,
       environment: .unimplemented
     )
 
-    let mainQueue = DispatchQueue.test
-    let bgQueue = DispatchQueue.test
-
-    enum Action: Equatable {
-      case didCreateMessenger
-      case didRemoveDB
-    }
-    var actions: [Action] = []
-
     store.environment.mainQueue = mainQueue.eraseToAnyScheduler()
     store.environment.bgQueue = bgQueue.eraseToAnyScheduler()
-    store.environment.messenger.create.run = { actions.append(.didCreateMessenger) }
-    store.environment.dbManager.removeDB.run = { actions.append(.didRemoveDB) }
+    store.environment.messenger.create.run = { didCreateMessenger += 1 }
 
     store.send(.newAccountTapped) {
       $0.isCreatingAccount = true
@@ -32,10 +27,7 @@ final class WelcomeFeatureTests: XCTestCase {
 
     bgQueue.advance()
 
-    XCTAssertNoDifference(actions, [
-      .didRemoveDB,
-      .didCreateMessenger
-    ])
+    XCTAssertNoDifference(didCreateMessenger, 1)
 
     mainQueue.advance()
 
@@ -60,38 +52,6 @@ final class WelcomeFeatureTests: XCTestCase {
     store.environment.mainQueue = mainQueue.eraseToAnyScheduler()
     store.environment.bgQueue = bgQueue.eraseToAnyScheduler()
     store.environment.messenger.create.run = { throw failure }
-    store.environment.dbManager.removeDB.run = {}
-
-    store.send(.newAccountTapped) {
-      $0.isCreatingAccount = true
-      $0.failure = nil
-    }
-
-    bgQueue.advance()
-    mainQueue.advance()
-
-    store.receive(.failed(failure.localizedDescription)) {
-      $0.isCreatingAccount = false
-      $0.failure = failure.localizedDescription
-    }
-  }
-
-  func testNewAccountTappedRemoveDBFailure() {
-    struct Failure: Error, Equatable {}
-    let failure = Failure()
-    let mainQueue = DispatchQueue.test
-    let bgQueue = DispatchQueue.test
-
-    let store = TestStore(
-      initialState: WelcomeState(),
-      reducer: welcomeReducer,
-      environment: .unimplemented
-    )
-
-    store.environment.mainQueue = mainQueue.eraseToAnyScheduler()
-    store.environment.bgQueue = bgQueue.eraseToAnyScheduler()
-    store.environment.messenger.create.run = {}
-    store.environment.dbManager.removeDB.run = { throw failure }
 
     store.send(.newAccountTapped) {
       $0.isCreatingAccount = true