NXDRIVE-153: Fix remote_id removal