Add collective.superfish + Clean code refs #5742