Fix some warnings
Remove unused query operator