core_info.c - cleanups