Cleanup IVCore #2