Revert "Add SchemaTreeAwareEffectiveStatement"