Do not use deprecated methods internally