Clean up commented out legacy lines.
Complete updates to replace QueryGenerator class.