took out a bit of dead code