Revert "add MessageType struct"

This reverts commit 3e1dbd437476b9553b1a79dac42eb9e1e1fbd5c3.