Merge "Rewrite pref cleanup script"