Disabled more functionality that’s incompatible with extension API