Revert "Added a bunch of stuff"

This reverts commit a2b731e8d694b3478ecc87a195ffeb934cde540f.