DVR: removed unused code
Merge commit '5d34f34' into newmaster