added messages model
Revert "added messages model"

This reverts commit 456b091792f607f3a78969f15e2309234b944032.
Merge branch 'master' into fix_validation