Cleanup on sample, removed debug message