Revert "Add Messages"

This reverts commit b3bd67680a2c5042fb14bd626ce576a4394da358.