Cleaned up a bunch of code that I made that didn't end up being used