[TASK] Code cleanup and TYPO3 6.0 compability