removing a bunch of stuff. sorry