Stop using deprecated functions