More examples cleanup