Cleaning up a bunch of code and removing a bunch of old, unused modules