VMWC: Testing removal of survey logic (take 2)