remove remaining references to the virtual option
Merge pull request #2808 from xabbuh/issue-2802

remove remaining references to the virtual option