reverts unintended changes introduced in 597b1d90bc5ebf17011ad52c3abc702c9e64a650
- removes duplicate message
- removes some dead code

-refs #1141