UPGRADE: mpr, http paks for cleanup.