removed a bunch of stuff