move ORCHIDEE munging to correct place