PackageViewer: Cleanup