added a bunch of dead code