remove debug info
Merge branch 'master' into production