Remove DeviceSettings +cleanup