Message format now is based on JSON.
Cleanup