Stop using deprecated classes