These are already documented as 'don't use in new apis'. Lets make it official and deprecate them properly.