Refactor UserPreferencesListener::removeOption()