Improvement: Remove import mapping fields