 
             @raw_query = @codemirror.getValue()
 
-            @query = @raw_query.replace(/(\s)*\/\/.*\n/g, '\n')
-            @query = @query.replace(/(\s)*\/\*[^]*\*\//g, '')
-            @query = @replace_new_lines_in_query @query # Save it because we'll use it in @callback_multilples_queries
+            @query = @clean_query @raw_query # Save it because we'll use it in @callback_multilples_queries
             
             # Execute the query
             try

            for char, i in query
                if to_skip > 0
                    to_skip--
                    continue

                if is_parsing_string is true

        #   world')
        # becomes
        #   r.expr('hello\nworld')
        #  We also remove comments from the query
        clean_query: (query) ->
            is_parsing_string = false
            start = 0

