A few methods were left in the wrong class when splitting up the dvr classes. This commit reduces the amount of dependency between the two. Change-Id: Id1b4f4e99a5c51576eddadd5eb0c973c0d5b46b8