cleanup comment queries