Mathewpeterson/add more deprecation

@dianakhuang @dmitchell @cpennington Review?
IF we don't need to pass `deprecated