Make removal entirely conditional on NEW_COMPONENT_TYPES
remove global scope from NEW_COMPONENT_TYPES AND NEW_RELATIONS