JIRA: https://jira.spring.io/browse/INT-4055 Further fixes for Sonar report Fix more errors from Sonar Fix unused `import`