Moved all vdr calls to stub