[TASK] #58302
Code Cleanup

Resolves: #58302
Releases: 6.2, 4.7, 4.5
Change-Id: Ib7c904078f8ebc3ab5004bfcfb68a823751f9a65
Reviewed-on: https://review.typo3.org/29714
Reviewed-by: Ralf Zimmermann
Tested-by: Ralf Zimmermann