refs #684 : Clean dead code