Remove calls to deprecated methods