- Clean up capability checking for entities (#4591)