[RCD] Get rid of skip_deleted