Moving away from iCloud continued

Previously I made the following changes:

Since then I’ve made a couple of additional changes:

As a side note, you may be wondering why I’m still using Bear since it uses iCloud for sync? Well, I’ve never once had a sync issue with it. It just always works in spite of all the other issues I’ve had with iCloud sync.