Save prefs and dot removal data optimizations