Remove unused code
Merge pull request #5123 from svbergerem/remove-unused-code

Remove unused code