Revert "Adding VSF working… (unless I broke something else)"

This reverts commit 1f85928a843ddeb7211e8cd3f5acdf03d906ec7c.