Revert "Revert"

This reverts commit 1ce96925f71eb0f45406427fe8be696acc41ef09.
remove row sched