Cleaned up PackageManager.