Some cleanup.
Removed some stuff in the message serializer.
Please check!