Make default message output configurable.
Remove unused and commented code.