Lps 32110 Clear up SampleSQLBuilder and DataFactory