reverts unintended changes introduced in 0789245f1385eec549765d91390d86431722cf8d
- removes duplicate message
- removes some dead code

-refs #1231