entities similar to #35054 cleanup edition api