Removed a bunch of stuff that wasn't needed