Expose $driver and add queryRemove