remove dead code
removed more dead code