-fixing #2153, code clean up in container_meta_data.c