Code (unused use) clean up
Merge pull request #5158 in master
Merge pull request #5195
Merge pull request #5195 in develop