Some cleanup
Merge branch 'cleanup'
Version bump