[trunk] Remove deprecated functions.