Setting cleanup, settings template changes.