Initial work to disable deprecated class methods.