query comment cleanup