Clean up messages
Merge branch 'develop'