removed more dead code