big dead code cleanup of comb3 pair style