Some clean up
Merge branch 'development'