QueryBuilder remove not needed code