Removed a bunch of stuff