(chore) code clean up for offline-first