more sonar identified stuff cleaned
removed some unused imports