Remove expensive query conditions