Fix cruft left over from CSV upload merge