Remove redundant samples and add sample with axes.
Update to new API.