Code Quality: fixed Sonar violations and unneeded imports