Deprecated functions are removed in this branch