Cleanups on examples