#37 remove now supports queries