Lineage info clean-up has been moved into the finally block