HV-805

0b4ac7678ae5632d59c33def1bc2208bb01cefe5 is a suggestion. We can either drop the commit or if you really prefer remove the unused messages. WDYT?