Sample cleanup.
Merge pull request #61 from bradserbuddy/SampleCleanup

Sample cleanup.