Disabled/removed debug printing and test function call.
Unified sampling methods.