diff --git a/pass.xcodeproj/project.pbxproj b/pass.xcodeproj/project.pbxproj
index 656c2b7..7b45bcb 100644
--- a/pass.xcodeproj/project.pbxproj
+++ b/pass.xcodeproj/project.pbxproj
@@ -30,7 +30,7 @@
 		DC917BEF1E2F38C5000FDF54 /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC917BEE1E2F38C5000FDF54 /* Result.framework */; };
 		DC962CDF1E4B62C10033B5D8 /* AboutTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC962CDE1E4B62C10033B5D8 /* AboutTableViewController.swift */; };
 		DCA049961E3357E000522E8F /* SwiftyUserDefaults.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCA049951E3357E000522E8F /* SwiftyUserDefaults.framework */; };
-		DCA049981E33586A00522E8F /* DefaultKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCA049971E33586A00522E8F /* DefaultKeys.swift */; };
+		DCA049981E33586A00522E8F /* DefaultsKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCA049971E33586A00522E8F /* DefaultsKeys.swift */; };
 		DCA0499A1E335CC800522E8F /* GitServerSettingTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCA049991E335CC800522E8F /* GitServerSettingTableViewController.swift */; };
 		DCA0499C1E3362F400522E8F /* PGPKeySettingTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCA0499B1E3362F400522E8F /* PGPKeySettingTableViewController.swift */; };
 		DCA0499E1E33BAC100522E8F /* Globals.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCA0499D1E33BAC100522E8F /* Globals.swift */; };
@@ -72,7 +72,7 @@
 		DC917BEE1E2F38C5000FDF54 /* Result.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Result.framework; path = Carthage/Build/iOS/Result.framework; sourceTree = "<group>"; };
 		DC962CDE1E4B62C10033B5D8 /* AboutTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AboutTableViewController.swift; sourceTree = "<group>"; };
 		DCA049951E3357E000522E8F /* SwiftyUserDefaults.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftyUserDefaults.framework; path = Carthage/Build/iOS/SwiftyUserDefaults.framework; sourceTree = "<group>"; };
-		DCA049971E33586A00522E8F /* DefaultKeys.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultKeys.swift; sourceTree = "<group>"; };
+		DCA049971E33586A00522E8F /* DefaultsKeys.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultsKeys.swift; sourceTree = "<group>"; };
 		DCA049991E335CC800522E8F /* GitServerSettingTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GitServerSettingTableViewController.swift; sourceTree = "<group>"; };
 		DCA0499B1E3362F400522E8F /* PGPKeySettingTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PGPKeySettingTableViewController.swift; sourceTree = "<group>"; };
 		DCA0499D1E33BAC100522E8F /* Globals.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Globals.swift; sourceTree = "<group>"; };
@@ -146,7 +146,7 @@
 			children = (
 				DCA0499D1E33BAC100522E8F /* Globals.swift */,
 				DC4A746D1E30FBDE00E8EB18 /* Objective-CBridgingHeader.h */,
-				DCA049971E33586A00522E8F /* DefaultKeys.swift */,
+				DCA049971E33586A00522E8F /* DefaultsKeys.swift */,
 				DC19400A1E4B36B60077E0A3 /* Utils.swift */,
 			);
 			path = Helpers;
@@ -376,7 +376,7 @@
 				DC1940001E49E1A60077E0A3 /* PasscodeLockConfiguration.swift in Sources */,
 				DC917BD71E2E8231000FDF54 /* AppDelegate.swift in Sources */,
 				DC193FFE1E49E0760077E0A3 /* PasscodeLockRepository.swift in Sources */,
-				DCA049981E33586A00522E8F /* DefaultKeys.swift in Sources */,
+				DCA049981E33586A00522E8F /* DefaultsKeys.swift in Sources */,
 				DC19400B1E4B36B60077E0A3 /* Utils.swift in Sources */,
 				DCA0499E1E33BAC100522E8F /* Globals.swift in Sources */,
 			);
diff --git a/pass/Helpers/DefaultKeys.swift b/pass/Helpers/DefaultsKeys.swift
similarity index 64%
rename from pass/Helpers/DefaultKeys.swift
rename to pass/Helpers/DefaultsKeys.swift
index ca33f2a..9af80f4 100644
--- a/pass/Helpers/DefaultKeys.swift
+++ b/pass/Helpers/DefaultsKeys.swift
@@ -28,3 +28,26 @@ extension DefaultsKeys {
     static let isTouchIDOn = DefaultsKey<Bool>("isTouchIDOn")
     static let passcodeKey = DefaultsKey<String?>("passcodeKey")
 }
+
+extension UserDefaults {
+    
+    func eraseAll() {
+        Defaults.remove(.pgpKeyURL)
+        
+        Defaults.remove(.pgpKeyPassphrase)
+        Defaults.remove(.pgpKeyID)
+        Defaults.remove(.pgpKeyUserID)
+        
+        Defaults.remove(.gitRepositoryURL)
+        Defaults.remove(.gitRepositoryAuthenticationMethod)
+        Defaults.remove(.gitRepositoryUsername)
+        Defaults.remove(.gitRepositoryPassword)
+        Defaults.remove(.gitRepositorySSHPublicKeyURL)
+        Defaults.remove(.gitRepositorySSHPrivateKeyURL)
+        Defaults.remove(.gitRepositorySSHPrivateKeyPassphrase)
+        Defaults.remove(.lastUpdatedTime)
+        
+        Defaults.remove(.isTouchIDOn)
+        Defaults.remove(.passcodeKey)
+    }
+}
diff --git a/pass/Models/PasswordStore.swift b/pass/Models/PasswordStore.swift
index 0784923..744ca0b 100644
--- a/pass/Models/PasswordStore.swift
+++ b/pass/Models/PasswordStore.swift
@@ -192,19 +192,6 @@ class PasswordStore {
         deleteCoreData(entityName: "PasswordEntity")
         deleteCoreData(entityName: "PasswordCategoryEntity")
         
-        Defaults.remove(.pgpKeyURL)
-        
-        Defaults.remove(.pgpKeyPassphrase)
-        Defaults.remove(.pgpKeyID)
-        Defaults.remove(.pgpKeyUserID)
-        
-        Defaults.remove(.gitRepositoryURL)
-        Defaults.remove(.gitRepositoryAuthenticationMethod)
-        Defaults.remove(.gitRepositoryUsername)
-        Defaults.remove(.gitRepositoryPassword)
-        Defaults.remove(.gitRepositorySSHPublicKeyURL)
-        Defaults.remove(.gitRepositorySSHPrivateKeyURL)
-        Defaults.remove(.gitRepositorySSHPrivateKeyPassphrase)
-        Defaults.remove(.lastUpdatedTime)
+        Defaults.eraseAll()
     }
 }