removing a bunch of dead code