* Removed old properties in models
* Added escape and unescape for messages strings.