Remove watch queues, fix bloom filters.