Rollback the block-sample to tuple-sample. Cleanup of codes.