We should definitely remove the legacy classes, but not before we are sure all uses of it (within our own repos) are changed to the public api variant.