Removed a bunch of stuff that we didn't need