clean-up to simplify maintenance: remove non optimized export. Clean to minimize changes that will be required by 2.63.