Mathewpeterson/add more deprecation

@dianakhuang @dmitchell @cpennington Review?
NVM, I see what you mean.