scheduler: row: do some clean up and some upgrading