more RequirementRegistry cleanup