Much clean up of collision logic for rows