Mathewpeterson/add more deprecation

@dianakhuang @dmitchell @cpennington Review?
I still need to change the warning.