Remove double call of keychain