Removal/master/pup 3311 provider deprecated methods