more dead code removed