Remove deprecated functions again