Clean up DVR class

Test: make
Change-Id: Iaf847955b999302661c686e30dd61f1e2d98344e
4 files changed