Remove innerCoursor from everywhere