d710: cleanup

Change-Id: I0ee25b55687d43af3223995500768af141654fe4