I've been using iCloud Drive more ever since the Dropbox kernel extension. Dropbox had also started going wild with indexing, causing battery drain.

I guess with this, it's time to switch over for good.