Removed unused code. Issue: #370
A bunch of tweaks to message display. Issue: #580