removed dead code
Merge pull request #5871 from craue/remove-dead-code-per-pr5835

remove dead code