Don't we need to deprecate these?