remove debug code
Merge branch 'master' into hg-production