cleanup pass through core_defs