TCon Import Cleanup