diff --git a/NativeAppTemplate.xcodeproj/project.pbxproj b/NativeAppTemplate.xcodeproj/project.pbxproj
index 56579ab..020f73a 100644
--- a/NativeAppTemplate.xcodeproj/project.pbxproj
+++ b/NativeAppTemplate.xcodeproj/project.pbxproj
@@ -89,7 +89,6 @@
 		017278832D7D935700CE424F /* ImageSaver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 017278802D7D935700CE424F /* ImageSaver.swift */; };
 		0172788B2D7D936E00CE424F /* CompletedTag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 017278842D7D936E00CE424F /* CompletedTag.swift */; };
 		0172788C2D7D936E00CE424F /* IdlingTagView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 017278872D7D936E00CE424F /* IdlingTagView.swift */; };
-		0172788D2D7D936E00CE424F /* CustomerScannedTag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 017278862D7D936E00CE424F /* CustomerScannedTag.swift */; };
 		017278902D7D936E00CE424F /* TagView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 017278892D7D936E00CE424F /* TagView.swift */; };
 		0172789A2D7D99D100CE424F /* ItemTagListCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 017278972D7D99D100CE424F /* ItemTagListCardView.swift */; };
 		0172789B2D7D99D100CE424F /* ItemTagListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 017278982D7D99D100CE424F /* ItemTagListView.swift */; };
@@ -250,7 +249,6 @@
 		0172787E2D7D933000CE424F /* ShopDetailCardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShopDetailCardView.swift; sourceTree = "<group>"; };
 		017278802D7D935700CE424F /* ImageSaver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageSaver.swift; sourceTree = "<group>"; };
 		017278842D7D936E00CE424F /* CompletedTag.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompletedTag.swift; sourceTree = "<group>"; };
-		017278862D7D936E00CE424F /* CustomerScannedTag.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomerScannedTag.swift; sourceTree = "<group>"; };
 		017278872D7D936E00CE424F /* IdlingTagView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IdlingTagView.swift; sourceTree = "<group>"; };
 		017278892D7D936E00CE424F /* TagView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TagView.swift; sourceTree = "<group>"; };
 		017278932D7D99D100CE424F /* ItemTagDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemTagDetailView.swift; sourceTree = "<group>"; };
@@ -701,7 +699,6 @@
 			isa = PBXGroup;
 			children = (
 				017278842D7D936E00CE424F /* CompletedTag.swift */,
-				017278862D7D936E00CE424F /* CustomerScannedTag.swift */,
 				017278872D7D936E00CE424F /* IdlingTagView.swift */,
 				017278892D7D936E00CE424F /* TagView.swift */,
 			);
@@ -989,7 +986,6 @@
 				0172788B2D7D936E00CE424F /* CompletedTag.swift in Sources */,
 				0172788C2D7D936E00CE424F /* IdlingTagView.swift in Sources */,
 				01A1339F2E08B2FD000AD24A /* AcceptTermsViewModel.swift in Sources */,
-				0172788D2D7D936E00CE424F /* CustomerScannedTag.swift in Sources */,
 				017278902D7D936E00CE424F /* TagView.swift in Sources */,
 				0106414429AA061100B46FED /* PasswordEditView.swift in Sources */,
 				0114F4032E07A88000F4A1DD /* ShopCreateViewModel.swift in Sources */,
diff --git a/NativeAppTemplate/Common/Errors/CodedError.swift b/NativeAppTemplate/Common/Errors/CodedError.swift
index 1cd9c64..11380b8 100644
--- a/NativeAppTemplate/Common/Errors/CodedError.swift
+++ b/NativeAppTemplate/Common/Errors/CodedError.swift
@@ -5,7 +5,7 @@
 
 // Error codes use the `NATI-XXXX` prefix (NativeAppTemplate iOS).
 // Android uses `NATA-XXXX`.
-// Ranges: 1xxx App errors, 2xxx API errors, 3xxx NFC errors.
+// Ranges: 1xxx App errors, 2xxx API errors.
 
 import Foundation
 
diff --git a/NativeAppTemplate/Styleguide/Color+Extensions.swift b/NativeAppTemplate/Styleguide/Color+Extensions.swift
index 4a7a2b9..f527205 100644
--- a/NativeAppTemplate/Styleguide/Color+Extensions.swift
+++ b/NativeAppTemplate/Styleguide/Color+Extensions.swift
@@ -141,18 +141,6 @@ extension Color {
     static let idlingTagBorder = coolGrey10 // #F5F7FA
     static let idlingTagForeground = coolGrey2 // #323F4B
 
-    // MARK: Tags - Preparing
-
-    static let preparingTagBackground = yellow9 // #FFF3C4
-    static let preparingTagBorder = yellow1 // #8D2B0B
-    static let preparingTagForeground = yellow1 // #8D2B0B
-
-    // MARK: Tags - Customer Scanned
-
-    static let customerScannedTagBackground = red9 // #FFBDBD
-    static let customerScannedTagBorder = coolGrey10 // #F5F7FA
-    static let customerScannedTagForeground = red1 // #610316
-
     // MARK: Tags - Completed
 
     static let completedTagBackground = green9 // #C1F2C7
@@ -339,30 +327,6 @@ extension ShapeStyle where Self == Color {
         Color.idlingTagForeground
     }
 
-    static var preparingTagBackground: Color {
-        Color.preparingTagBackground
-    }
-
-    static var preparingTagBorder: Color {
-        Color.preparingTagBorder
-    }
-
-    static var preparingTagForeground: Color {
-        Color.preparingTagForeground
-    }
-
-    static var customerScannedTagBackground: Color {
-        Color.customerScannedTagBackground
-    }
-
-    static var customerScannedTagBorder: Color {
-        Color.customerScannedTagBorder
-    }
-
-    static var customerScannedTagForeground: Color {
-        Color.customerScannedTagForeground
-    }
-
     static var completedTagBackground: Color {
         Color.completedTagBackground
     }
diff --git a/NativeAppTemplate/UI/Shared/MainButtonView.swift b/NativeAppTemplate/UI/Shared/MainButtonView.swift
index 3e986ac..b1a9696 100644
--- a/NativeAppTemplate/UI/Shared/MainButtonView.swift
+++ b/NativeAppTemplate/UI/Shared/MainButtonView.swift
@@ -73,11 +73,6 @@ struct MainButtonView: View {
                             .font(.uiButtonLabelLarge)
                             .foregroundStyle(type.color)
                             .padding(NativeAppTemplateConstants.Spacing.sm)
-                        // If commenting out below and select max large font size on settings accessibility, you will
-                        // not be enable to tap Scan button on Scan tab.
-//              .background(GeometryReader { proxy in
-//                Color.clear.preference(key: SizeKey.self, value: proxy.size)
-//              })
 
                         Spacer()
                     }
diff --git a/NativeAppTemplate/UI/Shared/Tags/CustomerScannedTag.swift b/NativeAppTemplate/UI/Shared/Tags/CustomerScannedTag.swift
deleted file mode 100644
index 0b3a146..0000000
--- a/NativeAppTemplate/UI/Shared/Tags/CustomerScannedTag.swift
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-//  CustomerScannedTag.swift
-//  NativeAppTemplate
-//
-
-import SwiftUI
-
-struct CustomerScannedTag: View {
-    var body: some View {
-        TagView(
-            text: "customer scanned",
-            textColor: .customerScannedTagForeground,
-            backgroundColor: .customerScannedTagBackground,
-            borderColor: .customerScannedTagBorder
-        )
-    }
-}
-
-struct CustomerScannedTag_Previews: PreviewProvider {
-    static var previews: some View {
-        VStack(spacing: NativeAppTemplateConstants.Spacing.xs) {
-            customerScannedTag.colorScheme(.light)
-            customerScannedTag.colorScheme(.dark)
-        }
-    }
-
-    static var customerScannedTag: some View {
-        CustomerScannedTag()
-            .padding()
-            .background(Color.backgroundColor)
-    }
-}