ROW and more clean up