Fixes CS : trailing spaces and unused use
Merge branch 'hotfix/6549'

Close #6549
Merge pull request #6551 from samsonasik/fix/cs-trailing-and-unused-use

Fixes CS : trailing spaces and unused use
Merge branch 'hotfix/6551' into develop

Forward port #6551