Remove some calls to deprecated methods