rm some noise from Annotations source
Add piecewise-linear option to derivative datasets

[#20986269]