Re-architected Messages
Message cleanup