Convert over device calls to use the new cleaners.