Debugged CleanupRiverCells.py