remove more deprecated functions