More examples clean-up