BS-2611, remove useless queries