Refactored Message -> AbstractMessage
Removed unused code