Query Builder clean up