Fix popups
Ensure that policy items are removed when a policy is removed
Fix service life consumed report