[TASK] Code cleanup

Change-Id: I0cd251a56f632bcd76585ec9c088af00e699d78b
Reviewed-on: http://review.typo3.org/33230
Reviewed-by: Xavier Perseguers <xavier@typo3.org>
Tested-by: Xavier Perseguers <xavier@typo3.org>