Remove more VDR leftovers
I'm not done yet, more to come
Remove VDR leftovers