Cleanup around StructureRegistry.