Start of work on removing settings alert