logging cleanup, and look for message state for deletes
Merge pull request #20 from beav/cleanup

logging cleanup, and look for message state for deletes