Removed message struct and its references to fix the build.