Clean up Message

See the change log.