Drop more dead code