Some cleanup
Merge branch 'dev'