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

This reverts commit 4215defb81fc2b469669592ac1094d7c70950192.
Fixes #6560 - Extract puppet parsing logic