Clean up get_sample