Fixes #1592: making report::expire faster and without errors

this patch lacks the orphaned messages and sources support :)