remove unused use
Merge branch 'master' into sf23-bs3

* master:
  remove unused use