API updates
More example cleanup