Got rid of dead code.