remove debug-code
Merge branch 'develop'