OFC-1368 - Improve species import tool performance
Code clean