Fix introduced bug + remove unused imports
Merge pull request #3374 from ussuri/small-fixes-3

Fix introduced bug + remove unused imports