Remove remnant of MessageId feature