cleanup class variables
Merge branch 'feature/issue-686-message-store-cache-migration-tools' into feature/issue-685-use-counters-for-message-counts