remove the rest of dead code