Remove "and sample" functions