Remove deprecated functions