Work on message output to remove non-puts