more dead code removal