Mathewpeterson/add more deprecation

@dianakhuang @dmitchell @cpennington Review?
Would add a comment here about this so that future us don't forget :)