minor updates to some code samples to remove extraneous items