- Keep only one class to provide access to identities stored in the database. - Remove old code and its tests. - Align KeyRing and IdentityRepository APIs. - Implement a (very) simple unit test for IdentityRepository.