Mathewpeterson/add more deprecation

@dianakhuang @dmitchell @cpennington Review?
Don't feel this particular set is addressed (L472-73)