DeviceViewer: Cleanup