Add compatibility with older version
Remove useless debug with old variable