ARGH #2, remove debug query