remove debugging code
Merge branch 'hotfix/2.2.2'