diff --git a/sql/item_sum.h b/sql/item_sum.h
index c01735b00ff..106de402d00 100644
--- a/sql/item_sum.h
+++ b/sql/item_sum.h
@@ -546,7 +546,6 @@ public:
   virtual bool add()= 0;
   virtual bool setup(THD *thd) { return false; }
   
-  //psergey: for window functions:
   virtual void remove() { DBUG_ASSERT(0); }
 
   virtual void cleanup();
@@ -555,7 +554,6 @@ public:
     return trace_unsupported_by_check_vcol_func_processor(func_name()); 
   }
   
-  //psergey-todo: this is ugly:
   virtual void setup_window_func(THD *thd, Window_spec *window_spec) {}
 };
 
@@ -787,7 +785,6 @@ class Item_sum_count :public Item_sum_int
   void clear();
   bool add();
   void cleanup();
-  // psergey-added:
   void remove();
 
   public:
diff --git a/sql/records.cc b/sql/records.cc
index 81de1878ba6..f208c507fbe 100644
--- a/sql/records.cc
+++ b/sql/records.cc
@@ -531,7 +531,7 @@ static int rr_unpack_from_tempfile(READ_RECORD *info)
 
   return 0;
 }
-//psergey: make this 'static' again:
+
 int rr_from_pointers(READ_RECORD *info)
 {
   int tmp;
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 875371a944f..ad4390e2157 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -3207,7 +3207,6 @@ void JOIN::exec_inner()
   if (select_options & SELECT_DESCRIBE)
   {
     do_select_call_count= 0;
-    // psergey-merge-todo: what to do with this ^^^ ?
 
     select_describe(this, need_tmp,
 		    order != 0 && !skip_sort_order,
@@ -8207,9 +8206,6 @@ prev_record_reads(POSITION *positions, uint idx, table_map found_ref)
 static JOIN_TAB *next_breadth_first_tab(JOIN_TAB *first_top_tab,
                                         uint n_top_tabs_count, JOIN_TAB *tab)
 {
-  /*
-    psergey-merge-todo: the following is UGLY:
-  */
   n_top_tabs_count += tab->join->aggr_tables;
   if (!tab->bush_root_tab)
   {
@@ -8499,7 +8495,6 @@ bool JOIN::get_best_combination()
                     (order ? 1 : 0) +
        (select_options & (SELECT_BIG_RESULT | OPTION_BUFFER_RESULT) ? 1 : 0) ;
   
-  // psergey-temp:
   if (select_lex->window_specs.elements)
     aggr_tables++;
 
diff --git a/sql/sql_window.cc b/sql/sql_window.cc
index 7c523387906..611fdb027a3 100644
--- a/sql/sql_window.cc
+++ b/sql/sql_window.cc
@@ -764,11 +764,6 @@ bool JOIN::process_window_functions(List<Item> *curr_fields_list)
 
 #if 0
   bool can_compute_window_live = !need_tmp;
-  /*
-    psergey-winfunc: temporarily disabled the below because there is no 
-    way to test it. Enable it back when we can.
-  */
-
   // Construct the window_functions item list and check if they can be
   // computed using only one sorting.
   //