removed unused local variable
removed unused namespace
removed unused return value
removed unused local variable
removed unused namespace
removed unused return value
Merge remote-tracking branch 'origin/ViewHelperCleanup' into ViewHelperCleanup
Merge pull request #5596