- and more dead code removal