Remove deprecated functions in TODO