AVALANCHE: Remove remaining off and on calls in commented code