Revert "a bunch of stuff"

This reverts commit 93a9ed6f997b9a8271d7eaaf952eb7c0524ffef7.