Removed deleting messages from sender and receiver, small refactoring