cleaned up multi-table row-level