settings/stores cleanup