Needed more cleanup on init_cases