Remove this, now in device