Removed Message class