Jms cleanup

Changes to clean up jms.  This relates to Issue #22.