AVALANCHE: for consistency, replace fv and ff loop variables by i and j. Remove some commented dead code