Removed more clutter from examples