Not needed anymore
mail.store.* cleanups