Adjust code according to CMS 6.2
[TASK] More clean code clean up...