diff --git a/PadelClub.xcodeproj/xcshareddata/xcschemes/PadelClub Raw.xcscheme b/PadelClub.xcodeproj/xcshareddata/xcschemes/PadelClub Raw.xcscheme
new file mode 100644
index 0000000..414b382
--- /dev/null
+++ b/PadelClub.xcodeproj/xcshareddata/xcschemes/PadelClub Raw.xcscheme	
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1520"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "NO">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C425D3FC2B6D249D002A7B48"
+               BuildableName = "PadelClub.app"
+               BlueprintName = "PadelClub"
+               ReferencedContainer = "container:PadelClub.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C425D3FC2B6D249D002A7B48"
+            BuildableName = "PadelClub.app"
+            BlueprintName = "PadelClub"
+            ReferencedContainer = "container:PadelClub.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C425D3FC2B6D249D002A7B48"
+            BuildableName = "PadelClub.app"
+            BlueprintName = "PadelClub"
+            ReferencedContainer = "container:PadelClub.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/PadelClub.xcodeproj/xcshareddata/xcschemes/PadelClub.xcscheme b/PadelClub.xcodeproj/xcshareddata/xcschemes/PadelClub.xcscheme
index e9c08aa..79259be 100644
--- a/PadelClub.xcodeproj/xcshareddata/xcschemes/PadelClub.xcscheme
+++ b/PadelClub.xcodeproj/xcshareddata/xcschemes/PadelClub.xcscheme
@@ -4,7 +4,7 @@
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "NO">
+      buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
diff --git a/PadelClub/Views/Subscription/Guard.swift b/PadelClub/Views/Subscription/Guard.swift
index b838727..1950f4d 100644
--- a/PadelClub/Views/Subscription/Guard.swift
+++ b/PadelClub/Views/Subscription/Guard.swift
@@ -123,16 +123,10 @@ import LeStorage
     }
     
     var currentPlan: StoreItem? {
-        
         #if DEBUG
         return nil
         #else
-        if let currentBestPlan = self.currentBestPlan, let plan = StorePlan(rawValue: currentBestPlan.productID) {
-            return plan
-        }
-        if let vf = Preferences.verifiedTransaction(),
-           vf.expiryDate > Date(), vf.graceDate > Date(),
-           let plan = StorePlan(rawValue: vf.productId) {
+        if let currentBestPlan = self.currentBestPlan, let plan = StoreItem(rawValue: currentBestPlan.productID) {
             return plan
         }
         return nil