Remove useless intermediate OD_*_DEST variables