Cleanup and removing some logging from example code