Remove accidentally added swp file
Update the xpath for row data to be more efficient

The old implementation would run 4 xpath queries per row, the new one
only runs one, and as an added bonus has simplified the checking of the
number of items we have in a row.