Fix for WK-121: Cleanup Publish Report