Cleanup use of example helpers