Finish converting order calls over.
Convert over client calls to use the new cleaners.