DeviceSettings: Massive cleanup