Migrate from EQC to proper