BZ-9429: clean up messages