Remove unnecessary calls to table.name