Clean up by getting rid of some blocks.
Bump
Merge branch 'release/1.0.1' into develop