remove severity icon
fix some sonar warnings