Revert "Fix vr shedular and some more"

This reverts commit 93c34ac5eab6995333d2db65d5919dbce8e6bde9.