Cleanup and make it compatible to TYPO3 6.2 (refs #358)