more lineage cleanup