[TASK] Cleanups

Change-Id: I627176d16fb7c362f80b517a6ba20e20c3ad868f
Reviewed-on: http://review.typo3.org/32546
Reviewed-by: Tim Lochmüller <tim@fruit-lab.de>
Tested-by: Tim Lochmüller <tim@fruit-lab.de>