Cleaned out a lot of now-unneeded stuff