MergeFace is there one for non planar?

Hi Steve - you’ll need to do this by hand - extract all the cylindrical bits, delete all but one, UntrimAll that, and then trim it up with the edge curves.

-Pascal