CS fixes (unused use statement)
Merge branch 'hotfix/cs'