(Settings data) Some cleanups