Even more dead code removal