Remove a little more dead code

approved this merge request

changed milestone to %Release-2.135.0

approved this merge request

added 8 commits

• a31f87f9...698704f9 - 7 commits from branch develop
• 083f9140 - Remove a little more dead code

Compare with previous version

enabled an automatic merge when all merge checks for 083f9140 pass

merged