Mathewpeterson/add more deprecation

@dianakhuang @dmitchell @cpennington Review?
should this not be a class-level or file-level static variable?