remove debug info
Merge branch 'dev' into nighty