         set(value) {
             if let unwrappedValue = value {
                 self.keychain.save(self.accountId, tokenType: .ExpirationDate, value: unwrappedValue.toString())
+            } else {
+                self.keychain.delete(self.accountId, tokenType: .ExpirationDate)
             }
         }
     }

        set(value) {
            if let unwrappedValue = value {
                _ = self.keychain.save(self.accountId, tokenType: .RefreshExpirationDate, value: unwrappedValue.toString())
            }
        }
    }

        set(value) {
            if let unwrappedValue = value {
                self.keychain.save(self.accountId, tokenType: .AccessToken, value: unwrappedValue)
            } else {
                self.keychain.delete(self.accountId, tokenType: .AccessToken)
            }
        }
    }
