sp filt mk II - clean up and optimise cc4

Clean up dead code.
Optimise connected components 4's union find to remember grand-parents as parents.