Refactor SqlQuery2 into SqlQuery (and remove old one).