Doubtless there will be more opportunities to simplify, but for now cleaning out the low hanging fruit. Dropping Sphinx documented deprecations and simple TODO comments.
