Fixes CS : unused use
Merge branch 'cs/#6629-remove-unused-code'

Close #6629