CLEANUP and RENAME for new Presets feature