Cleaned up a lot of unnecessary files/code