Removed the bits that tried to auto-correct for ambiguous fields in where, join, group, and order clauses