Merge "Remove unused add_sample()"