Example clean up - still in 0.8 shape