remove old ancestor calculation code
fix broken tests