Cleanup the following items
- Remove the SkipBuiltins and IsTextField properties. They are only used to convert null string values to empty strings
- Split out long classes into sub classes for better code organization
- Convert the ExtraCriteriaField/ExtraCriteriaValue properties to a single string[] ExtraWhere property
Cleanup the following items