Cleaned up code, and removed now obsolete WeaveMessage.