logging cleanup, and look for message state for deletes