Examples cleanups