simplify Builder by extracting the building part into GenericSql class.
removed some unused methods, member properties, etc.