killing more dead code