reformat again, fix pointless message duplication