kill more dead code