more dead code removal
make another test pass