Deleted more cruft.
Reorganized code for functional grouping.  Made message functions real