Clean up some of the blocks and examples.