Removed unnecessary draw_samples in all