CAINT-1347 Revised some code flagged as deprected.