Cleanup in device_info_settings.xml