Resolve #3415081 "Remove unused code"

Closes #3415081

added 6 commits

• 3d7a92d9...8c89dc23 - 3 commits from branch project:8.x-1.x
• a4b41b61 - issue-3415081-error-class-fixes
• 5d6e9f3e - removed unused use statements
• 675961dc - 3415081: fix code issue

Compare with previous version

added 1 commit

• db880870 - 3415081: fix code issue

Compare with previous version