- remove testing code
Merge branch 'develop'