More cleanup - replace deprecated api usages.