Cleaned up handling of EntityRemoveMessage
Moved more handling of `UpdateMessage` inside the cards
Removed unnecessary cast