diff --git a/Alfie/Alfie/Views/HomeView/HomeView.swift b/Alfie/Alfie/Views/HomeView/HomeView.swift
index c9ec7e0..b61cc8c 100644
--- a/Alfie/Alfie/Views/HomeView/HomeView.swift
+++ b/Alfie/Alfie/Views/HomeView/HomeView.swift
@@ -1,9 +1,6 @@
 import Models
 import StyleGuide
 import SwiftUI
-#if DEBUG
-import Mocks
-#endif
 
 struct HomeView: View {
     @EnvironmentObject var coordinador: Coordinator
@@ -69,9 +66,7 @@ private enum Constants {
     static let cancelAccessibilityId = "back-btn"
 }
 
-#if DEBUG
 #Preview {
     HomeView()
         .environmentObject(Coordinator())
 }
-#endif
diff --git a/Alfie/Alfie/Views/ShopView/Categories/CategoriesView.swift b/Alfie/Alfie/Views/ShopView/Categories/CategoriesView.swift
index 4ec669f..597f179 100644
--- a/Alfie/Alfie/Views/ShopView/Categories/CategoriesView.swift
+++ b/Alfie/Alfie/Views/ShopView/Categories/CategoriesView.swift
@@ -45,9 +45,7 @@ struct CategoriesView<ViewModel: CategoriesViewModelProtocol>: View {
                 errorView
             }
         }
-        .modifier(
-            CategoriesToolbarModifier(showToolbar: viewModel.shouldShowToolbar, title: viewModel.title)
-        )
+        .modifier(CategoriesToolbarModifier(showToolbar: viewModel.shouldShowToolbar, title: viewModel.title))
         .onAppear {
             viewModel.viewDidAppear()
         }
diff --git a/Alfie/Alfie/Views/ShopView/Categories/CategoriesViewModel.swift b/Alfie/Alfie/Views/ShopView/Categories/CategoriesViewModel.swift
index d250eff..6eebfe2 100644
--- a/Alfie/Alfie/Views/ShopView/Categories/CategoriesViewModel.swift
+++ b/Alfie/Alfie/Views/ShopView/Categories/CategoriesViewModel.swift
@@ -72,19 +72,12 @@ final class CategoriesViewModel: CategoriesViewModelProtocol {
 
     private(set) var shouldShowToolbar: Bool
 
-    init(
-        navigationService: NavigationServiceProtocol,
-        showToolbar: Bool = false
-    ) {
+    init(navigationService: NavigationServiceProtocol, showToolbar: Bool = false) {
         self.navigationService = navigationService
         self.shouldShowToolbar = showToolbar
     }
 
-    init(
-        categories: [NavigationItem],
-        title: String,
-        showToolbar: Bool = true
-    ) {
+    init(categories: [NavigationItem], title: String, showToolbar: Bool = true) {
         self.navigationService = nil
         self.state = .success(.init(categories: categories, title: title))
         self.shouldShowToolbar = showToolbar
diff --git a/Alfie/Alfie/Views/WishListView/WishListDependencyContainer.swift b/Alfie/Alfie/Views/WishListView/WishListDependencyContainer.swift
index ea78387..96ed145 100644
--- a/Alfie/Alfie/Views/WishListView/WishListDependencyContainer.swift
+++ b/Alfie/Alfie/Views/WishListView/WishListDependencyContainer.swift
@@ -5,10 +5,7 @@ final class WishListDependencyContainer: WishListDependencyContainerProtocol {
     let wishListService: WishListServiceProtocol
     let bagService: BagServiceProtocol
 
-    init(
-        wishListService: WishListServiceProtocol,
-        bagService: BagServiceProtocol
-    ) {
+    init(wishListService: WishListServiceProtocol, bagService: BagServiceProtocol) {
         self.wishListService = wishListService
         self.bagService = bagService
     }
diff --git a/Alfie/AlfieTests/Features/BagViewModelTests.swift b/Alfie/AlfieTests/Features/BagViewModelTests.swift
index 928722a..f14f8de 100644
--- a/Alfie/AlfieTests/Features/BagViewModelTests.swift
+++ b/Alfie/AlfieTests/Features/BagViewModelTests.swift
@@ -11,10 +11,7 @@ final class BagViewModelTests: XCTestCase {
     override func setUpWithError() throws {
         try super.setUpWithError()
         mockWebViewConfigurationService = MockWebViewConfigurationService()
-        mockDependencies = BagDependencyContainer(
-            bagService: MockBagService(),
-            configurationService: MockConfigurationService()
-        )
+        mockDependencies = BagDependencyContainer(bagService: MockBagService())
         sut = .init(dependencies: mockDependencies)
     }
 
diff --git a/Alfie/AlfieTests/Features/CategoriesViewModelTests.swift b/Alfie/AlfieTests/Features/CategoriesViewModelTests.swift
index aded7c5..57c802a 100644
--- a/Alfie/AlfieTests/Features/CategoriesViewModelTests.swift
+++ b/Alfie/AlfieTests/Features/CategoriesViewModelTests.swift
@@ -6,20 +6,16 @@ import XCTest
 final class CategoriesViewModelTests: XCTestCase {
     private var sut: CategoriesViewModel!
     private var mockNavigationService: MockNavigationService!
-    private var mockConfigurationService: MockConfigurationService!
 
     override func setUpWithError() throws {
         try super.setUpWithError()
         mockNavigationService = MockNavigationService()
-        mockConfigurationService = MockConfigurationService()
-
-        sut = .init(navigationService: mockNavigationService, configurationService: mockConfigurationService)
+        sut = .init(navigationService: mockNavigationService)
     }
 
     override func tearDownWithError() throws {
         sut = nil
         mockNavigationService = nil
-        mockConfigurationService = nil
         try super.tearDownWithError()
     }
 
@@ -149,7 +145,8 @@ final class CategoriesViewModelTests: XCTestCase {
     }
 
     func test_ignores_loads_items_from_service_when_view_appears_if_categories_init_is_used() {
-        sut = .init(configurationService: mockConfigurationService, categories: [], title: "")
+        sut = .init(categories: [], title: "")
+
         let expectation = expectation(description: "Wait for no service call")
         expectation.isInverted = true
         mockNavigationService.onGetNavigationItemsCalled = { _ in
@@ -165,7 +162,7 @@ final class CategoriesViewModelTests: XCTestCase {
 
     func test_categories_are_available_immediately_on_categories_init() {
         let fixtures = NavigationItem.fixtures
-        sut = .init(configurationService: mockConfigurationService, categories: fixtures, title: "")
+        sut = .init(categories: fixtures, title: "")
         XCTAssertEqual(sut.categories.count, fixtures.count)
     }
 
@@ -324,7 +321,7 @@ final class CategoriesViewModelTests: XCTestCase {
 
     func test_title_is_available_when_passed_on_categories_init() {
         let title = "Some Title"
-        sut = .init(configurationService: mockConfigurationService, categories: [], title: title)
+        sut = .init(categories: [], title: title)
         XCTAssertEqual(sut.title, title)
     }
 
@@ -335,16 +332,16 @@ final class CategoriesViewModelTests: XCTestCase {
     // MARK: - Toolbar
 
     func test_show_toolbar_is_properly_set_on_init() {
-        sut = .init(configurationService: mockConfigurationService, categories: [], title: "", showToolbar: true)
+        sut = .init(categories: [], title: "", showToolbar: true)
         XCTAssertTrue(sut.shouldShowToolbar)
 
-        sut = .init(configurationService: mockConfigurationService, categories: [], title: "", showToolbar: false)
+        sut = .init(categories: [], title: "", showToolbar: false)
         XCTAssertFalse(sut.shouldShowToolbar)
 
-        sut = .init(navigationService: mockNavigationService, configurationService: mockConfigurationService, showToolbar: true)
+        sut = .init(navigationService: mockNavigationService, showToolbar: true)
         XCTAssertTrue(sut.shouldShowToolbar)
 
-        sut = .init(navigationService: mockNavigationService, configurationService: mockConfigurationService, showToolbar: false)
+        sut = .init(navigationService: mockNavigationService, showToolbar: false)
         XCTAssertFalse(sut.shouldShowToolbar)
     }
 
diff --git a/Alfie/Packages/Core/BFFGraphApi/.swiftpm/xcode/xcuserdata/timeavarga.xcuserdatad/xcschemes/xcschememanagement.plist b/Alfie/Packages/Core/BFFGraphApi/.swiftpm/xcode/xcuserdata/timeavarga.xcuserdatad/xcschemes/xcschememanagement.plist
deleted file mode 100644
index b364414..0000000
--- a/Alfie/Packages/Core/BFFGraphApi/.swiftpm/xcode/xcuserdata/timeavarga.xcuserdatad/xcschemes/xcschememanagement.plist
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>BFFGraphApi.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>8</integer>
-		</dict>
-		<key>BFFGraphMocks.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>9</integer>
-		</dict>
-	</dict>
-</dict>
-</plist>