Remove internal use of deprecated methods.