(core_info.c) Cleanups