Re-add taskprocessor cleanup code that was removed by the UUID merge.