Knocked off a bunch more deprecated functions.