remove DeviceSettings

Change-Id: Ic1330fca15ef8a0b525cf147d02fc6bed76c871b