Clean up
Merge branch 'develop'
"Clean up comments"