Clean up work
Merge branch 'develop'