Clean up of SamplePlayer code.