Revert "more moto things and stuff"

This reverts commit 5a57f3edaaaf24f0577552e6a6fbbd1d547ff5b5.