Clean up the ivy files to reduce duplication.