Mathewpeterson/add more deprecation

@dianakhuang @dmitchell @cpennington Review?
I'm not clearly following what this if is doing - add comments please