Remove unused DeviceState