Port some deprecated methods

1 job for master in 13 minutes and 59 seconds (queued for 127 minutes and 40 seconds)