* removed more dead code