Port stage-2 ClusterAlgo changes from pre6 into pre7
Stage-2: remove filtered clusters from the tau inputs