deprecate pre-2.0 add/subtract
deprecate pre-2.0 add/subtract
fix todo
cleanup
Merge pull request #1763 from icambron/add_subtract_order

deprecate pre-2.0 add/subtract