Some changes
Remove rows collection