Samples cleanup

Just notice I forgot to send the PR for the remaining cleanups in the sample.