[BUGFIX] Cleanup and prepare 7.0 changes / comment

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