Commenting unused query see #7033