remove dead code
more dead code