More example cleanup