Revert "continue converting things to conveyor"

This reverts commit 7e7a45d2bc34b5f391990bdb9b805dc71201cc7b.
Revert "start using conveyor"

This reverts commit 4e09b25c31a1099704df56d76c95b5fa369d8282.