Remove comments from queries while standardizing them