temporarily disable query cleaning because it was buggy