merged message cleanup from SonarBeserk
reduce fireworks total