Remove transitional 'old_id'