Finally as we decided, moving just to FTU where is needed, and making the sim import require the icc