Removing a bunch of stuff that isn't necessary