Sonar minor issues fix

Removed unused imports.
Sonar minor issues fix

Fixed pom.xml indent issues - replaced 4 spaces with 2 spaces indent.