Some code clearing
Merge branch 'develop'