[TASK] Code cleanup

Change-Id: I07c104669eed7280abb79701a07249bfaa183a54
Reviewed-on: https://review.typo3.org/30600
Reviewed-by: Wouter Wolters
Tested-by: Wouter Wolters