Removed unused message model fields
Removed tearDown function